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

1 files changed, 2 insertions, 0 deletions

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);