diff options
| author | Derick Rethans <github@derickrethans.nl> | 2012-08-24 10:55:17 +0200 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2012-08-24 10:55:17 +0200 |
| commit | e5bfcd340a8e6aa9e46bef43894c78c06e80a3c8 (patch) | |
| tree | 7e11e961bd43b1eb3af7149ce8af8b03d7f4ac2c /Zend/zend_language_scanner.c | |
| parent | 0a2833bbefd803a63014429973b14839718975e2 (diff) | |
| parent | 13bcf685cb0a92e502ebe39f4b22c64304a9f333 (diff) | |
| download | php-git-e5bfcd340a8e6aa9e46bef43894c78c06e80a3c8.tar.gz | |
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
Diffstat (limited to 'Zend/zend_language_scanner.c')
| -rw-r--r-- | Zend/zend_language_scanner.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 1d0ada7a64..15a48fad8c 100644 --- 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 16:59:07 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 { @@ -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 { |