support neighbouring extension in the ZendMM custom handlers hook

Author: realFlowControl

ext/zend_test/php_test.h

@@ -56,8 +56,15 @@ ZEND_BEGIN_MODULE_GLOBALS(zend_test)
 	bool print_stderr_mshutdown;
 	zend_long limit_copy_file_range;
 	int observe_opline_in_zendmm;
+	// previous heap from ZendMM
 	zend_mm_heap* zend_orig_heap;
+	// custom heap with custom handlers
 	zend_mm_heap* zend_test_heap;
+	// previous handlers that might have been installed
+	// `USE_ZEND_ALLOC=0` installs custom handlers
+	void* (*zendmm_orig_malloc)(size_t);
+	void (*zendmm_orig_free)(void*);
+	void* (*zendmm_orig_realloc)(void *, size_t);
 	zend_test_fiber *active_fiber;
 	zend_long quantity_value;
 	zend_string *str_test;

ext/zend_test/test.c

@@ -522,6 +522,9 @@ void * zend_test_custom_malloc(size_t len)
 	if (has_opline(EG(current_execute_data))) {
 		assert(EG(current_execute_data)->opline->lineno != (uint32_t)-1);
 	}
+	if (ZT_G(zendmm_orig_malloc)) {
+		return ZT_G(zendmm_orig_malloc)(len);
+	}
 	return _zend_mm_alloc(ZT_G(zend_orig_heap), len ZEND_FILE_LINE_EMPTY_CC ZEND_FILE_LINE_EMPTY_CC);
 }
 
@@ -530,6 +533,10 @@ void zend_test_custom_free(void *ptr)
 	if (has_opline(EG(current_execute_data))) {
 		assert(EG(current_execute_data)->opline->lineno != (uint32_t)-1);
 	}
+	if (ZT_G(zendmm_orig_free)) {
+		ZT_G(zendmm_orig_free)(ptr);
+		return;
+	}
 	_zend_mm_free(ZT_G(zend_orig_heap), ptr ZEND_FILE_LINE_EMPTY_CC ZEND_FILE_LINE_EMPTY_CC);
 }
 
@@ -538,9 +545,47 @@ void * zend_test_custom_realloc(void * ptr, size_t len)
 	if (has_opline(EG(current_execute_data))) {
 		assert(EG(current_execute_data)->opline->lineno != (uint32_t)-1);
 	}
+	if (ZT_G(zendmm_orig_realloc)) {
+		return ZT_G(zendmm_orig_realloc)(ptr, len);
+	}
 	return _zend_mm_realloc(ZT_G(zend_orig_heap), ptr, len ZEND_FILE_LINE_EMPTY_CC ZEND_FILE_LINE_EMPTY_CC);
 }
 
+void zend_test_install_custom_mm_handler(void)
+{
+	// fetch maybe installed previous handlers
+	if (!is_zend_mm()) {
+		zend_mm_get_custom_handlers(
+			zend_mm_get_heap(),
+			&ZT_G(zendmm_orig_malloc),
+			&ZT_G(zendmm_orig_free),
+			&ZT_G(zendmm_orig_realloc)
+		);
+	}
+	// `zend_mm_heap` is a private struct, so we have not way to find the
+	// actual size, but 4096 bytes should be enough
+	ZT_G(zend_test_heap) = malloc(4096);
+	memset(ZT_G(zend_test_heap), 0, 4096);
+	zend_mm_set_custom_handlers(
+		ZT_G(zend_test_heap),
+		zend_test_custom_malloc,
+		zend_test_custom_free,
+		zend_test_custom_realloc
+	);
+	ZT_G(zend_orig_heap) = zend_mm_get_heap();
+	zend_mm_set_heap(ZT_G(zend_test_heap));
+}
+
+void zend_test_uninstall_custom_mm_handler(void)
+{
+	free(ZT_G(zend_test_heap));
+	ZT_G(zend_test_heap) = NULL;
+	ZT_G(zendmm_orig_malloc) = NULL;
+	ZT_G(zendmm_orig_free) = NULL;
+	ZT_G(zendmm_orig_realloc) = NULL;
+	zend_mm_set_heap(ZT_G(zend_orig_heap));
+}
+
 static PHP_INI_MH(OnUpdateZendTestObserveOplineInZendMM)
 {
 	if (new_value == NULL) {
@@ -550,22 +595,9 @@ static PHP_INI_MH(OnUpdateZendTestObserveOplineInZendMM)
 	int int_value = zend_ini_parse_bool(new_value);
 
 	if (int_value == 1) {
-		// `zend_mm_heap` is a private struct, so we have not way to find the
-		// actual size, but 4096 bytes should be enough
-		ZT_G(zend_test_heap) = malloc(4096);
-		memset(ZT_G(zend_test_heap), 0, 4096);
-		zend_mm_set_custom_handlers(
-			ZT_G(zend_test_heap),
-			zend_test_custom_malloc,
-			zend_test_custom_free,
-			zend_test_custom_realloc
-		);
-		ZT_G(zend_orig_heap) = zend_mm_get_heap();
-		zend_mm_set_heap(ZT_G(zend_test_heap));
+		zend_test_install_custom_mm_handler();
 	} else if (ZT_G(zend_test_heap))  {
-		free(ZT_G(zend_test_heap));
-		ZT_G(zend_test_heap) = NULL;
-		zend_mm_set_heap(ZT_G(zend_orig_heap));
+		zend_test_uninstall_custom_mm_handler();
 	}
 	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
 }
@@ -971,9 +1003,7 @@ PHP_RSHUTDOWN_FUNCTION(zend_test)
 	zend_hash_destroy(&ZT_G(global_weakmap));
 
 	if (ZT_G(zend_test_heap))  {
-		free(ZT_G(zend_test_heap));
-		ZT_G(zend_test_heap) = NULL;
-		zend_mm_set_heap(ZT_G(zend_orig_heap));
+		zend_test_uninstall_custom_mm_handler();
 	}
 
 	return SUCCESS;

ext/zend_test/tests/opline_dangling.phpt

@@ -4,8 +4,6 @@ possible segfault in `ZEND_BIND_STATIC`
 https://github.com/php/php-src/pull/12758
 --EXTENSIONS--
 zend_test
---ENV--
-USE_ZEND_ALLOC=1
 --INI--
 zend_test.observe_opline_in_zendmm=1
 --FILE--

ext/zend_test/tests/opline_dangling_02.phpt

@@ -2,8 +2,6 @@
 possible segfault in `ZEND_FUNC_GET_ARGS`
 --EXTENSIONS--
 zend_test
---ENV--
-USE_ZEND_ALLOC=1
 --INI--
 zend_test.observe_opline_in_zendmm=1
 --FILE--