Modify zend_collect_module_handlers to handle existing allocations

Author: bukka

Zend/zend_API.c

@@ -2271,7 +2271,8 @@ ZEND_API void zend_collect_module_handlers(void) /* {{{ */
 			post_deactivate_count++;
 		}
 	} ZEND_HASH_FOREACH_END();
-	module_request_startup_handlers = (zend_module_entry**)malloc(
+	module_request_startup_handlers = (zend_module_entry**)realloc(
+		module_request_startup_handlers,
 	    sizeof(zend_module_entry*) *
 		(startup_count + 1 +
 		 shutdown_count + 1 +
@@ -2303,7 +2304,8 @@ ZEND_API void zend_collect_module_handlers(void) /* {{{ */
 		}
 	} ZEND_HASH_FOREACH_END();
 
-	class_cleanup_handlers = (zend_class_entry**)malloc(
+	class_cleanup_handlers = (zend_class_entry**)realloc(
+		class_cleanup_handlers,
 		sizeof(zend_class_entry*) *
 		(class_count + 1));
 	class_cleanup_handlers[class_count] = NULL;
@@ -2326,15 +2328,10 @@ ZEND_API void zend_startup_modules(void) /* {{{ */
 }
 /* }}} */
 
-ZEND_API void zend_destroy_module_handlers(void)
+ZEND_API void zend_destroy_modules(void) /* {{{ */
 {
 	free(class_cleanup_handlers);
 	free(module_request_startup_handlers);
-}
-
-ZEND_API void zend_destroy_modules(void) /* {{{ */
-{
-	zend_destroy_module_handlers();
 	zend_hash_graceful_reverse_destroy(&module_registry);
 }
 /* }}} */

Zend/zend_API.h

@@ -361,7 +361,6 @@ ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module);
 ZEND_API zend_result zend_startup_module_ex(zend_module_entry *module);
 ZEND_API void zend_startup_modules(void);
 ZEND_API void zend_collect_module_handlers(void);
-ZEND_API void zend_destroy_module_handlers(void);
 ZEND_API void zend_destroy_modules(void);
 ZEND_API void zend_check_magic_method_implementation(
 		const zend_class_entry *ce, const zend_function *fptr, zend_string *lcname, int error_type);