From: Zeev Suraski <zeev@php.net>
Date: Sun, 7 Jan 2001 02:47:32 +0000 (+0000)
Subject: Fix possibility of a crash during startup (very unlikely, but possible)
X-Git-Tag: php-4.0.5RC1~708
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f23e50789d08fca28926c1ab629af1b1688ac4e;p=php

Fix possibility of a crash during startup (very unlikely, but possible)
---

diff --git a/Zend/zend.c b/Zend/zend.c
index e5b392f39d..b94d2ccf64 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -301,6 +301,7 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals)
 	}
 	zend_init_rsrc_plist(ELS_C);
 	EG(lambda_count)=0;
+	EG(user_error_handler) = NULL;
 }
 
 
@@ -401,6 +402,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
 #else
 	zend_startup_constants();
 	zend_set_default_compile_time_values(CLS_C);
+	EG(user_error_handler) = NULL;
 #endif
 	zend_register_standard_constants(ELS_C);