svn: /php/php-src/ branches/PHP_5_3/Zend/zend_language_scanner.l trunk/Zend/zend_language_scanner.l

pajoye Wed, 17 Nov 2010 16:46:19 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=305464 Log: - NULL deref fix, patch by Gustavo Changed paths: U php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.l U php/php-src/trunk/Zend/zend_language_scanner.l Modified: php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.l =================================================================== --- php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.l 2010-11-17 15:00:51 UTC (rev 305463) +++ php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.l 2010-11-17 16:46:19 UTC (rev 305464) @@ -284,6 +284,10 @@ SCNG(script_filtered_size) = SCNG(script_org_size); } else { SCNG(input_filter)(&SCNG(script_filtered), &SCNG(script_filtered_size), SCNG(script_org), SCNG(script_org_size) TSRMLS_CC); + if (SCNG(script_filtered) == NULL) { + zend_error_noreturn(E_COMPILE_ERROR, "Could not convert the script from the detected " + "encoding \"%s\" to a compatible encoding", LANG_SCNG(script_encoding)->name); + } } SCNG(yy_start) = SCNG(script_filtered) - offset; yy_scan_buffer((char *)SCNG(script_filtered), SCNG(script_filtered_size) TSRMLS_CC); Modified: php/php-src/trunk/Zend/zend_language_scanner.l =================================================================== --- php/php-src/trunk/Zend/zend_language_scanner.l 2010-11-17 15:00:51 UTC (rev 305463) +++ php/php-src/trunk/Zend/zend_language_scanner.l 2010-11-17 16:46:19 UTC (rev 305464) @@ -284,6 +284,10 @@ SCNG(script_filtered_size) = SCNG(script_org_size); } else { SCNG(input_filter)(&SCNG(script_filtered), &SCNG(script_filtered_size), SCNG(script_org), SCNG(script_org_size) TSRMLS_CC); + if (SCNG(script_filtered) == NULL) { + zend_error_noreturn(E_COMPILE_ERROR, "Could not convert the script from the detected " + "encoding \"%s\" to a compatible encoding", LANG_SCNG(script_encoding)->name); + } } SCNG(yy_start) = SCNG(script_filtered) - offset; yy_scan_buffer((char *)SCNG(script_filtered), SCNG(script_filtered_size) TSRMLS_CC);