Disable zend_rc_debug during dl() (#8552)

arnaud-lb · web-flow · commit e9fcb5bd43a3 · 2022-05-17T18:46:16.000+02:00
Newly added dl() tests trigger an assertion in ZEND_RC_DEBUG builds. This change
disables zend_rc_debug to allows these tests to pass until this issue is
resolved.
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
@@ -58,10 +58,19 @@ PHPAPI PHP_FUNCTION(dl)
 		RETURN_FALSE;
 	}
 
+#if ZEND_RC_DEBUG
+	bool orig_rc_debug = zend_rc_debug;
+	zend_rc_debug = false;
+#endif
+
 	php_dl(filename, MODULE_TEMPORARY, return_value, 0);
 	if (Z_TYPE_P(return_value) == IS_TRUE) {
 		EG(full_tables_cleanup) = 1;
 	}
+
+#if ZEND_RC_DEBUG
+	zend_rc_debug = orig_rc_debug;
+#endif
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,19 @@ PHPAPI PHP_FUNCTION(dl)`
`58`	`58`	`RETURN_FALSE;`
`59`	`59`	`}`
`60`	`60`
	`61`	`+#if ZEND_RC_DEBUG`
	`62`	`+ bool orig_rc_debug = zend_rc_debug;`
	`63`	`+ zend_rc_debug = false;`
	`64`	`+#endif`
	`65`	`+`
`61`	`66`	`php_dl(filename, MODULE_TEMPORARY, return_value, 0);`
`62`	`67`	`if (Z_TYPE_P(return_value) == IS_TRUE) {`
`63`	`68`	`EG(full_tables_cleanup) = 1;`
`64`	`69`	`}`
	`70`	`+`
	`71`	`+#if ZEND_RC_DEBUG`
	`72`	`+ zend_rc_debug = orig_rc_debug;`
	`73`	`+#endif`
`65`	`74`	`}`
`66`	`75`	`/* }}} */`
`67`	`76`