cvs: ZendEngine2 / zend.c
| From: | Andi Gutmans | Date: | Sun, 24 Nov 2002 20:15:57 +0000 |
| Subject: | cvs: ZendEngine2 / zend.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-657@lists.php.net to get a copy of this message | ||
andi Sun Nov 24 15:15:57 2002 EDT
Modified files:
/ZendEngine2 zend.c
Log:
- Fix crash
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.190 ZendEngine2/zend.c:1.191
--- ZendEngine2/zend.c:1.190 Tue Nov 19 12:51:30 2002
+++ ZendEngine2/zend.c Sun Nov 24 15:15:56 2002
@@ -813,7 +813,9 @@
orig_user_error_handler = EG(user_error_handler);
EG(user_error_handler) = NULL;
if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5,
params, 1, NULL TSRMLS_CC)==SUCCESS) {
- zval_ptr_dtor(&retval);
+ if (retval) {
+ zval_ptr_dtor(&retval);
+ }
} else {
/* The user error handler failed, use built-in error handler */
zend_error_cb(type, error_filename, error_lineno, format, args);