diff options
| author | Julien Pauli <jpauli@php.net> | 2017-06-29 20:24:03 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2017-06-29 20:24:03 +0200 |
| commit | e57fce4d00538467b8c5e1d401343fad0846051c (patch) | |
| tree | 498b66566f236cd5b314d0bae2ecb638adaf8f02 /Zend/zend_API.c | |
| parent | c8bb64c406cc7a6fd56d7831aabac52f5402677e (diff) | |
| parent | 2a1ad885388d1287b7a963d5b9ca9d297163ec19 (diff) | |
| download | php-git-e57fce4d00538467b8c5e1d401343fad0846051c.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Updated NEWS
Fix bug #74832, crash in extension loading
Diffstat (limited to 'Zend/zend_API.c')
| -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 8d5ef2b0b9..e1a6392c9f 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2024,17 +2024,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; } /* }}} */ |