From: Anatol Belski <ab@php.net>
Date: Thu, 16 May 2013 06:40:56 +0000 (+0200)
Subject: Fixed bug #64853Use of no longer available ini directives causes crash on TS build
X-Git-Tag: php-5.5.0RC2~19^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d82704b6779cf54e9c8bd16ecc78c612892b4c9d;p=php

Fixed bug #64853Use of no longer available ini directives causes crash on TS build

The fatal error for removed ini options is thrown before the executor
init, so ensure the relevant variables are initialized.
---

diff --git a/NEWS b/NEWS
index 879f13bf71..5aeb4c9973 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ PHP                                                                        NEWS
 
 - Core:
   . Fixed bug #64729 (compilation failure on x32). (Gustavo)
+  . Fixed bug #64853 (Use of no longer available ini directives causes crash on
+    TS build). (Anatol)
 
 - Fileinfo:
   . Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol)
diff --git a/main/main.c b/main/main.c
index 7a253f8b23..c0db64d184 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2070,6 +2070,8 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 	EG(exception_class) = NULL;
 	PG(disable_functions) = NULL;
 	PG(disable_classes) = NULL;
+	EG(exception) = NULL;
+	EG(objects_store).object_buckets = NULL;
 
 #if HAVE_SETLOCALE
 	setlocale(LC_CTYPE, "");