Fixed bug #60194 for eavl

same reason here

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index e3fc576e9102f9bc4cd0d1045427d5e5e0fe7569..15a48fad8c696dda4cec3310aa1fa7778ed68dbb 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 Sat Jul 28 00:45:37 2012 */
+/* Generated by re2c 0.13.5 on Sat Jul 28 16:59:07 2012 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -445,7 +445,7 @@ ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename TSRMLS_D
        zend_multibyte_set_filter(CG(internal_encoding) 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 266162747e0d1b3140b046f1ea0716dbc626c559..c92bf2b107ee0b158c821a9417801cc4ca7d5ddd 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -443,7 +443,7 @@ ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename TSRMLS_D
        zend_multibyte_set_filter(CG(internal_encoding) 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 d1955a88ef89fb572fbd26b27b1d385a9b2114c6..02a2a39500a031c1871befc7a94e544623de110d 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 Sat Jul 28 00:45:37 2012 */
+/* Generated by re2c 0.13.5 on Sat Jul 28 16:59:07 2012 */
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {