From 07eb0f49705f6ca0981ea236e112fa699f8ba26c Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 3 Mar 2014 16:42:34 +0800 Subject: [PATCH] Fixed NULL pointer def --- ext/standard/url_scanner_ex.c | 4 ++-- ext/standard/url_scanner_ex.re | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index 71ebae0b66..e79ab89a62 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -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); } diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re index 31224f0901..556e172cab 100644 --- a/ext/standard/url_scanner_ex.re +++ b/ext/standard/url_scanner_ex.re @@ -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); } -- 2.40.0