Fix bug #74832, crash in extension loading

Julien Pauli · Julien Pauli · commit 3f4340a79630 · 2017-06-29T20:22:21.000+02:00
diff --git 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;
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -2028,17 +2028,19 @@ ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module) /`
`2028`	`2028`	`zend_string_release(lcname);`
`2029`	`2029`	`return NULL;`
`2030`	`2030`	`}`
`2031`		`- zend_string_release(lcname);`
`2032`	`2031`	`module = module_ptr;`
`2033`	`2032`	`EG(current_module) = module;`
`2034`	`2033`
`2035`	`2034`	`if (module->functions && zend_register_functions(NULL, module->functions, NULL, module->type)==FAILURE) {`
	`2035`	`+ zend_hash_del(&module_registry, lcname);`
	`2036`	`+ zend_string_release(lcname);`
`2036`	`2037`	`EG(current_module) = NULL;`
`2037`	`2038`	`zend_error(E_CORE_WARNING,"%s: Unable to register functions, unable to load", module->name);`
`2038`	`2039`	`return NULL;`
`2039`	`2040`	`}`
`2040`	`2041`
`2041`	`2042`	`EG(current_module) = NULL;`
	`2043`	`+ zend_string_release(lcname);`
`2042`	`2044`	`return module;`
`2043`	`2045`	`}`
`2044`	`2046`	`/* }}} */`