diff options
Diffstat (limited to 'Zend/zend_language_scanner.c')
| -rw-r--r-- | Zend/zend_language_scanner.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 1cb027f11..3f5fefa7c 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1,10 +1,10 @@ -/* Generated by re2c 0.13.5 on Mon May 04 19:38:30 2009 */ +/* Generated by re2c 0.13.5 on Mon Nov 16 23:30:01 2009 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ | Zend Engine | +----------------------------------------------------------------------+ - | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) | + | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ | This source file is subject to version 2.00 of the Zend license, | | that is bundled with this package in the file LICENSE, and is | @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.c 279948 2009-05-05 01:44:52Z mattwil $ */ +/* $Id: zend_language_scanner.c 293155 2010-01-05 20:46:53Z sebastian $ */ #if 0 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c) @@ -685,12 +685,12 @@ ZEND_API int zend_multibyte_read_script(unsigned char *buf, size_t n TSRMLS_DC) { if (SCNG(script_org)) { efree(SCNG(script_org)); + SCNG(script_org) = NULL; } - SCNG(script_org_size) = n; - SCNG(script_org) = (unsigned char*)erealloc(SCNG(script_org), SCNG(script_org_size)); - memcpy(SCNG(script_org) + SCNG(script_org_size) - n, buf, n); + SCNG(script_org_size) = n; - SCNG(script_org) = (unsigned char*)erealloc(SCNG(script_org), SCNG(script_org_size) + 1); + SCNG(script_org) = (unsigned char*)emalloc(SCNG(script_org_size) + 1); + memcpy(SCNG(script_org), buf, n); *(SCNG(script_org)+SCNG(script_org_size)) = '\0'; return 0; |