From: Andi Gutmans <andi@php.net>
Date: Sun, 23 May 2004 20:27:32 +0000 (+0000)
Subject: - Fix the following script (it crashed):
X-Git-Tag: php-5.0.0RC3RC1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef9878647df7bac9deb79bc2d691557a724dce21;p=php

- Fix the following script (it crashed):
<?php
   class ErrorHandler {
     function __construct() {
       set_error_handler(array(&$this, 'handle'));
     }

     function __destruct() {
       restore_error_handler();
     }

     function handle($code, $msg, $file, $line, $locals) {
     }
   }

   new ErrorHandler();
?>
---

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 69015a6b18..3e9c72f0c0 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1005,8 +1005,12 @@ ZEND_FUNCTION(set_error_handler)
 ZEND_FUNCTION(restore_error_handler)
 {
 	if (EG(user_error_handler)) {
-		zval_ptr_dtor(&EG(user_error_handler));
+		zval *zeh = EG(user_error_handler);
+
+		EG(user_error_handler) = NULL;
+		zval_ptr_dtor(&zeh);
 	}
+
 	if (zend_ptr_stack_num_elements(&EG(user_error_handlers))==0) {
 		EG(user_error_handler) = NULL;
 	} else {