From 31acd1c26e6c9dfb1cc2b12e4394cd5e38fb11aa Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 16 Oct 2006 11:13:08 +0000 Subject: [PATCH] Fixed bug #39140 (Uncaught exception may cause crash) --- NEWS | 1 + Zend/zend.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 01b5ee57fb..c52076b0e6 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ PHP NEWS 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) diff --git a/Zend/zend.c b/Zend/zend.c index e23005b739..b9fe854aa9 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1097,6 +1097,8 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co 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'; -- 2.50.1