| Dmitry Stogov 2006-10-16, 7:56 am |
| dmitry Mon Oct 16 11:13:09 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/ZendEngine2 zend.c
Log:
Fixed bug #39140 (Uncaught exception may cause crash)
http://cvs.php.net/viewvc.cgi/php-s...7&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.306 php-src/NEWS:1.2027.2.547.2.307
--- php-src/NEWS:1.2027.2.547.2.306 Mon Oct 16 10:46:59 2006
+++ php-src/NEWS Mon Oct 16 11:13:08 2006
@@ -3,6 +3,7 @@
12 Oct 2006, PHP 5.2.0RC6
- Fixed invalid read in imagecreatefrompng when an empty file is given
(Pierre, Tony)
+- Fixed bug #39140 (Uncaught exception may cause crash). (Dmitry)
- Fixed bug #39020 (PHP in FastCGI server mode crashes). (Dmitry)
- Fixed bug #38458, PECL bug #8944, PECL bug #7775 (error retrieving
columns after long/text columns with PDO_ODBC). (Wez)
http://cvs.php.net/viewvc.cgi/ZendE...2&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.308.2.12.2.21 ZendEngine2/zend.c:1.308.2.12.2.22
--- ZendEngine2/zend.c:1.308.2.12.2.21 Fri Oct 6 16:50:21 2006
+++ ZendEngine2/zend.c Mon Oct 16 11:13:08 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.c,v 1.308.2.12.2.21 2006/10/06 16:50:21 pollita Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.22 2006/10/16 11:13:08 dmitry Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -1097,6 +1097,8 @@
zend_execute(EG(active_op_array) TSRMLS_CC);
if (EG(exception)) {
char ex_class_name[128];
+
+ EG(opline_ptr) = NULL;
if (Z_TYPE_P(EG(exception)) == IS_OBJECT) {
strncpy(ex_class_name, Z_OBJ_CLASS_NAME_P(EG(exception)), 127);
ex_class_name[127] = '\0';
|