summaryrefslogtreecommitdiff
path: root/Zend/zend.c
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2004-03-01 13:29:45 +0000
committerAndi Gutmans <andi@php.net>2004-03-01 13:29:45 +0000
commit7c72f6ff6161b2fd0421b5de240321e2ca032d13 (patch)
tree11b66a432ce0636b1b0e463bf6bc6a324758acbe /Zend/zend.c
parent5e4b2874638d694ee6c58a878e26612bced898f1 (diff)
downloadphp-git-7c72f6ff6161b2fd0421b5de240321e2ca032d13.tar.gz
- Fix crash in exception handling (zend_exception_error(...) and
zend_eval_string_ex() were buggy (Dmitry, Andi)
Diffstat (limited to 'Zend/zend.c')
-rw-r--r--Zend/zend.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index 316abaec9f..4fc4fdcb21 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1061,8 +1061,6 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co
}
} else {
zend_exception_error(EG(exception) TSRMLS_CC);
- zval_ptr_dtor(&EG(exception));
- EG(exception) = NULL;
}
efree(params);
zval_ptr_dtor(&old_exception);
@@ -1072,8 +1070,6 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co
}
} else {
zend_exception_error(EG(exception) TSRMLS_CC);
- zval_ptr_dtor(&EG(exception));
- EG(exception) = NULL;
}
if (retval == NULL && *EG(return_value_ptr_ptr) != NULL) {
zval_ptr_dtor(EG(return_value_ptr_ptr));