Introduce a new guard recursion type for var_export

Author: bukka

Diff for: Zend/zend_types.h

@@ -617,7 +617,8 @@ struct _zend_ast_ref {
 #define ZEND_GUARD_PROPERTY_ISSET	(1<<3)
 #define ZEND_GUARD_PROPERTY_MASK	15
 #define ZEND_GUARD_RECURSION_DEBUG	(1<<4)
-#define ZEND_GUARD_RECURSION_JSON	(1<<5)
+#define ZEND_GUARD_RECURSION_EXPORT	(1<<5)
+#define ZEND_GUARD_RECURSION_JSON	(1<<6)
 
 #define ZEND_GUARD_RECURSION_TYPE(t) ZEND_GUARD_RECURSION_ ## t
 

Diff for: ext/standard/var.c

@@ -564,12 +564,12 @@ PHPAPI void php_var_export_ex(zval *struc, int level, smart_str *buf) /* {{{ */
 			 * if the result won't be used. (https://github.com/php/php-src/issues/8044) */
 			zend_object *zobj = Z_OBJ_P(struc);
 			uint32_t *guard = zend_get_recursion_guard(zobj);
-			if (ZEND_GUARD_OR_GC_IS_RECURSIVE(guard, DEBUG, zobj)) {
+			if (ZEND_GUARD_OR_GC_IS_RECURSIVE(guard, EXPORT, zobj)) {
 				smart_str_appendl(buf, "NULL", 4);
 				zend_error(E_WARNING, "var_export does not handle circular references");
 				return;
 			}
-			ZEND_GUARD_OR_GC_PROTECT_RECURSION(guard, DEBUG, zobj);
+			ZEND_GUARD_OR_GC_PROTECT_RECURSION(guard, EXPORT, zobj);
 			myht = zend_get_properties_for(struc, ZEND_PROP_PURPOSE_VAR_EXPORT);
 			if (level > 1) {
 				smart_str_appendc(buf, '\n');
@@ -603,7 +603,7 @@ PHPAPI void php_var_export_ex(zval *struc, int level, smart_str *buf) /* {{{ */
 				}
 				zend_release_properties(myht);
 			}
-			ZEND_GUARD_OR_GC_UNPROTECT_RECURSION(guard, DEBUG, zobj);
+			ZEND_GUARD_OR_GC_UNPROTECT_RECURSION(guard, EXPORT, zobj);
 			if (level > 1 && !is_enum) {
 				buffer_append_spaces(buf, level - 1);
 			}