Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK with run...

It's not a big deal, just because lexer will read the char after cursor before leaving

diff --git a/NEWS b/NEWS
index 8f5512367a1d933062aac6851feb7d79a73994fa..5aa35d7e20b923648f1b6ad1641fb41ffdc23f2b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2012, PHP 5.3.16
 
+- Core:
+  . Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK
+    with run-test.php). (Laruence)
+
 - CURL:
   . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false).
     (r.hampartsumyan@gmail.com, Laruence)

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 1d0ada7a64d5f6e8319c55a7da1d334c04a83349..e3fc576e9102f9bc4cd0d1045427d5e5e0fe7569 100644 (file)
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Feb 15 17:38:31 2012 */
+/* Generated by re2c 0.13.5 on Sat Jul 28 00:45:37 2012 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -287,7 +287,7 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC)
                zend_multibyte_set_filter(NULL TSRMLS_CC);
 
                if (!SCNG(input_filter)) {
-                       SCNG(script_filtered) = (unsigned char*)emalloc(SCNG(script_org_size)+1);
+                       SCNG(script_filtered) = (unsigned char*)emalloc(SCNG(script_org_size)+2);
                        memcpy(SCNG(script_filtered), SCNG(script_org), SCNG(script_org_size)+1);
                        SCNG(script_filtered_size) = SCNG(script_org_size);
                } else {

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 9b2e453dd659a4c95ca9c91df2abcd2948dfb288..266162747e0d1b3140b046f1ea0716dbc626c559 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -285,7 +285,7 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC)
                zend_multibyte_set_filter(NULL TSRMLS_CC);
 
                if (!SCNG(input_filter)) {
-                       SCNG(script_filtered) = (unsigned char*)emalloc(SCNG(script_org_size)+1);
+                       SCNG(script_filtered) = (unsigned char*)emalloc(SCNG(script_org_size)+2);
                        memcpy(SCNG(script_filtered), SCNG(script_org), SCNG(script_org_size)+1);
                        SCNG(script_filtered_size) = SCNG(script_org_size);
                } else {

diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index adaedcf1aace837bd2b8f0f6b71ee2da8562d8dc..d1955a88ef89fb572fbd26b27b1d385a9b2114c6 100644 (file)
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Feb 15 17:38:31 2012 */
+/* Generated by re2c 0.13.5 on Sat Jul 28 00:45:37 2012 */
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {