]> granicus.if.org Git - php/commitdiff
Fixed NULL pointer def
authorXinchen Hui <laruence@gmail.com>
Mon, 3 Mar 2014 08:42:34 +0000 (16:42 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 3 Mar 2014 08:42:34 +0000 (16:42 +0800)
ext/standard/url_scanner_ex.c
ext/standard/url_scanner_ex.re

index 71ebae0b66cde80c23e9790619c57a4c5362701d..e79ab89a625a00c1ddf313ed0a83dcc9dfa79703 100644 (file)
@@ -1021,14 +1021,14 @@ PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int va
        smart_str val;
        zend_string *encoded;
        
-       if (BG(url_adapt_state_ex).active) {
+       if (BG(url_adapt_state_ex).active) {
                php_url_scanner_ex_activate(TSRMLS_C);
                php_output_start_internal(ZEND_STRL("URL-Rewriter"), php_url_scanner_output_handler, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC);
                BG(url_adapt_state_ex).active = 1;
        }
 
 
-       if (BG(url_adapt_state_ex).url_app.s->len != 0) {
+       if (BG(url_adapt_state_ex).url_app.s) {
                smart_str_appends(&BG(url_adapt_state_ex).url_app, PG(arg_separator).output);
        }
 
index 31224f0901ac3e9e00dcd37d8da1fae0799f3cf0..556e172cab00d45d12ff17d614233e09f59b277e 100644 (file)
@@ -473,14 +473,14 @@ PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int va
        smart_str val;
        zend_string *encoded;
        
-       if (BG(url_adapt_state_ex).active) {
+       if (BG(url_adapt_state_ex).active) {
                php_url_scanner_ex_activate(TSRMLS_C);
                php_output_start_internal(ZEND_STRL("URL-Rewriter"), php_url_scanner_output_handler, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC);
                BG(url_adapt_state_ex).active = 1;
        }
 
 
-       if (BG(url_adapt_state_ex).url_app.s->len != 0) {
+       if (BG(url_adapt_state_ex).url_app.s) {
                smart_str_appends(&BG(url_adapt_state_ex).url_app, PG(arg_separator).output);
        }