diff options
| author | Anatol Belski <ab@php.net> | 2013-05-16 08:40:56 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-05-16 08:40:56 +0200 |
| commit | d82704b6779cf54e9c8bd16ecc78c612892b4c9d (patch) | |
| tree | 95fdff2df6c6cdd32f5dd03c8b852409b3f7493e | |
| parent | 09470ebf35a47ac34c3ffa5524ccb47ff404cd5a (diff) | |
| download | php-git-d82704b6779cf54e9c8bd16ecc78c612892b4c9d.tar.gz | |
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.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | main/main.c | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -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, ""); |