diff options
| author | Julien Pauli <jpauli@php.net> | 2017-06-29 20:25:18 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2017-06-29 20:25:18 +0200 |
| commit | cf7ae7054075f46c2a8a8182d5706e935667aea5 (patch) | |
| tree | 21312bcbc7d9551be0ef1f370b5b1b3670d2cde6 /Zend | |
| parent | 5ed83f7e846a9b6bd844df8818180a890c1904cb (diff) | |
| parent | 72f71432954f4ddca9e4df0b3951eacabe73c2bb (diff) | |
| download | php-git-cf7ae7054075f46c2a8a8182d5706e935667aea5.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Updated NEWS
Updated NEWS
Fix bug #74832, crash in extension loading
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 2a0fafbedb..82def3a36d 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2055,17 +2055,19 @@ ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module) / zend_string_release(lcname); return NULL; } - zend_string_release(lcname); module = module_ptr; EG(current_module) = module; if (module->functions && zend_register_functions(NULL, module->functions, NULL, module->type)==FAILURE) { + zend_hash_del(&module_registry, lcname); + zend_string_release(lcname); EG(current_module) = NULL; zend_error(E_CORE_WARNING,"%s: Unable to register functions, unable to load", module->name); return NULL; } EG(current_module) = NULL; + zend_string_release(lcname); return module; } /* }}} */ |