From: Julien Pauli <jpauli@php.net>
Date: Thu, 29 Jun 2017 18:22:21 +0000 (+0200)
Subject: Fix bug #74832, crash in extension loading
X-Git-Tag: php-7.0.22RC1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f4340a79630579e06cf95603687f792bd133332;p=php

Fix bug #74832, crash in extension loading
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 43c6209ba4..262429c79d 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2028,17 +2028,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;
 }
 /* }}} */