svn: /php/php-src/branches/PHP_5_3/ NEWS Zend/zend_language_scanner.c Zend/zend_language_scanner.l
| From: | Felipe Pena | Date: | Tue, 17 Nov 2009 11:18:40 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3/ NEWS Zend/zend_language_scanner.c Zend/zend_language_scanner.l | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60932@lists.php.net to get a copy of this message | ||
felipe Tue, 17 Nov 2009 11:18:40 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=290862
Log:
- Fixed bug #50145 (crash while running bug35634.phpt)
Bugs: http://bugs.php.net/50145 (Open) crash while running
bug35634.phpt
http://bugs.php.net/35634 (Closed) Erroneous
"Class declarations may not be nested" error raised.
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.c
U php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.l
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-11-17 10:03:02 UTC (rev 290861)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-11-17 11:18:40 UTC (rev 290862)
@@ -23,6 +23,7 @@
- Fixed bug #50174 (Incorrectly matched docComment). (Felipe)
- Fixed bug #50158 (FILTER_VALIDATE_EMAIL fails with valid addresses
containing = or ?). (Pierrick)
+- Fixed bug #50145 (crash while running bug35634.phpt). (Felipe)
- Fixed bug #50087 (NSAPI performance improvements). (Uwe Schindler)
- Fixed bug #50152 (ReflectionClass::hasProperty behaves like isset() not
property_exists). (Felipe)
Modified: php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.c
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.c 2009-11-17 10:03:02 UTC (rev 290861)
+++ php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.c 2009-11-17 11:18:40 UTC (rev 290862)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Thu Sep 10 15:34:33 2009 */
+/* Generated by re2c 0.13.5 on Mon Nov 16 23:30:01 2009 */
#line 1 "Zend/zend_language_scanner.l"
/*
+----------------------------------------------------------------------+
@@ -685,12 +685,12 @@
{
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;
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 2009-11-17 10:03:02 UTC (rev 290861)
+++ php/php-src/branches/PHP_5_3/Zend/zend_language_scanner.l 2009-11-17 11:18:40 UTC (rev 290862)
@@ -683,12 +683,12 @@
{
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;