com php-src: Fixed bug #64853Use of no longer available ini directives causes crash on TS build: NEWS main/main.c

Commit: d82704b6779cf54e9c8bd16ecc78c612892b4c9d Author: Anatol Belski <ab@php.net> Thu, 16 May 2013 08:40:56 +0200 Parents: 09470ebf35a47ac34c3ffa5524ccb47ff404cd5a Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d82704b6779cf54e9c8bd16ecc78c612892b4c9d Log: 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. Bugs: https://bugs.php.net/64853 Changed paths: M NEWS M main/main.c Diff: diff --git a/NEWS b/NEWS index 879f13b..5aeb4c9 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 7a253f8..c0db64d 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, "");