Revise zend_mm_check_in_userinput()

Author: arnaud-lb

Zend/zend_alloc.c

@@ -2856,12 +2856,10 @@ ZEND_API void zend_mm_userinput_end(void)
 #endif
 }
 
-ZEND_API bool zend_mm_check_in_userinput(void)
+ZEND_API void zend_mm_check_in_userinput(void)
 {
 #if ZEND_MM_HEAP_PROTECTION
-	return AG(use_userinput_zone);
-#else
-	return true;
+	ZEND_ASSERT(AG(use_userinput_zone));
 #endif
 }
 

Zend/zend_alloc.h

@@ -225,7 +225,7 @@ ZEND_API bool is_zend_mm(void);
 ZEND_API bool is_zend_ptr(const void *ptr);
 ZEND_API void zend_mm_userinput_begin(void);
 ZEND_API void zend_mm_userinput_end(void);
-ZEND_API bool zend_mm_check_in_userinput(void);
+ZEND_API void zend_mm_check_in_userinput(void);
 
 ZEND_API size_t zend_memory_usage(bool real_usage);
 ZEND_API size_t zend_memory_peak_usage(bool real_usage);

Zend/zend_compile.c

@@ -2017,7 +2017,9 @@ ZEND_API void zend_activate_auto_globals(void) /* {{{ */
 {
 	zend_auto_global *auto_global;
 
-	ZEND_ASSERT(zend_mm_check_in_userinput());
+#if ZEND_DEBUG
+	zend_mm_check_in_userinput();
+#endif
 
 	ZEND_HASH_MAP_FOREACH_PTR(CG(auto_globals), auto_global) {
 		if (auto_global->jit) {

main/main.c

@@ -1840,7 +1840,9 @@ zend_result php_request_startup(void)
 {
 	zend_result retval = SUCCESS;
 
-	ZEND_ASSERT(zend_mm_check_in_userinput());
+#if ZEND_DEBUG
+	zend_mm_check_in_userinput();
+#endif
 
 	zend_interned_strings_activate();