dmitry Fri Feb 3 09:31:59 2006 UTC
Added files: (Branch: PHP_5_1)
/ZendEngine2/tests bug36268.phpt
Modified files:
/php-src NEWS
/php-src/main main.c
Log:
Fixed bug #36268 (Object destructors called even after fatal errors)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.394&r2=1.2027.2.395&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.394 php-src/NEWS:1.2027.2.395
--- php-src/NEWS:1.2027.2.394 Thu Feb 2 12:19:13 2006
+++ php-src/NEWS Fri Feb 3 09:31:59 2006
@@ -19,6 +19,7 @@
- Added imap_savebody() that allows message body to be written to a file.
(Mike)
- Fixed imagecolorallocate() and imagecolorallocatelapha() to return FALSE
on error. (Pierre)
+- Fixed bug #36268 (Object destructors called even after fatal errors).
(Dmitry)
- Fixed bug #36258 (SplFileObject::getPath() may lead to segfault). (Tony)
- Fixed bug #36242 (Possible memory corruption in stream_select()). (Tony)
- Fixed bug #36235 (ocicolumnname returns false before a succesfull fetch).
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.14&r2=1.640.2.15&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.14 php-src/main/main.c:1.640.2.15
--- php-src/main/main.c:1.640.2.14 Mon Jan 16 09:09:37 2006
+++ php-src/main/main.c Fri Feb 3 09:31:59 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.14 2006/01/16 09:09:37 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.15 2006/02/03 09:31:59 dmitry Exp $ */
/* {{{ includes
*/
@@ -820,6 +820,7 @@
AG(memory_limit) = PG(memory_limit);
#endif
efree(buffer);
+
zend_objects_store_mark_destructed(&EG(objects_store) TSRMLS_CC);
zend_bailout();
return;
}
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/bug36268.phpt?view=markup&rev=1.1
Index: ZendEngine2/tests/bug36268.phpt
+++ ZendEngine2/tests/bug36268.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
