now we use "signed char" explicitly instead of the vague "char" type.

openresty · Nov 24, 2011 · 4349b2a · 4349b2a
1 parent 767e94f
commit 4349b2a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/src/ngx_http_xss_filter_module.c b/src/ngx_http_xss_filter_module.c
@@ -192,7 +192,7 @@ ngx_http_xss_header_filter(ngx_http_request_t *r)
     callback.data = p;
     callback.len = dst - p;
 
-    if (ngx_http_xss_test_callback((char *) callback.data, callback.len)
+    if (ngx_http_xss_test_callback(callback.data, callback.len)
             != NGX_OK)
     {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,

diff --git a/src/ngx_http_xss_util.c b/src/ngx_http_xss_util.c
@@ -18,19 +18,21 @@ static const int javascript_en_main = 1;
 
 #line 8 "src/ngx_http_xss_util.rl"
 
-ngx_int_t ngx_http_xss_test_callback(char *data, size_t len)
+ngx_int_t ngx_http_xss_test_callback(u_char *data, size_t len)
 {
-    char *p = data;
-    char *pe = data + len;
+    signed char *p = (signed char *) data;
+    signed char *pe;
     int cs;
 
+    pe = p + len;
+
 
-#line 29 "src/ngx_http_xss_util.c"
+#line 31 "src/ngx_http_xss_util.c"
 	{
 	cs = javascript_start;
 	}
 
-#line 34 "src/ngx_http_xss_util.c"
+#line 36 "src/ngx_http_xss_util.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -126,13 +128,13 @@ case 5:
 	_out: {}
 	}
 
-#line 27 "src/ngx_http_xss_util.rl"
+#line 29 "src/ngx_http_xss_util.rl"
 
 
     if (cs < 
-#line 134 "src/ngx_http_xss_util.c"
+#line 136 "src/ngx_http_xss_util.c"
 6
-#line 29 "src/ngx_http_xss_util.rl"
+#line 31 "src/ngx_http_xss_util.rl"
  || p != pe) {
         return NGX_DECLINED;
     }

diff --git a/src/ngx_http_xss_util.h b/src/ngx_http_xss_util.h
@@ -14,7 +14,7 @@
 #endif
 
 
-ngx_int_t ngx_http_xss_test_callback(char *data, size_t len);
+ngx_int_t ngx_http_xss_test_callback(u_char *data, size_t len);
 
 
 #endif /* NGX_HTTP_XSS_UTIL_H */

diff --git a/src/ngx_http_xss_util.rl b/src/ngx_http_xss_util.rl
@@ -6,12 +6,14 @@
 %% machine javascript;
 %% write data;
 
-ngx_int_t ngx_http_xss_test_callback(char *data, size_t len)
+ngx_int_t ngx_http_xss_test_callback(u_char *data, size_t len)
 {
-    char *p = data;
-    char *pe = data + len;
+    signed char *p = (signed char *) data;
+    signed char *pe;
     int cs;
 
+    pe = p + len;
+
     %%{
         identifier = [$A-Za-z_] [$A-Za-z0-9_]*;
 

diff --git a/util/build.sh b/util/build.sh
@@ -14,7 +14,7 @@ version=$1
 force=$2
 
 ngx-build $force $version \
-            --with-cc-opt="-O3" \
+            --with-cc-opt="-O3 -funsigned-char" \
             --without-mail_pop3_module \
             --without-mail_imap_module \
             --without-mail_smtp_module \