better fix for #63055

laruence · laruence · commit e88cdaa0143a · 2012-10-18T20:10:35.000+08:00
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
@@ -40,6 +40,8 @@ ZEND_API void _zval_dtor_func(zval *zvalue ZEND_FILE_LINE_DC)
 				TSRMLS_FETCH();
 
 				if (zvalue->value.ht && (zvalue->value.ht != &EG(symbol_table))) {
+					/* break possible cycles */
+					Z_TYPE_P(zvalue) = IS_NULL;
 					zend_hash_destroy(zvalue->value.ht);
 					FREE_HASHTABLE(zvalue->value.ht);
 				}
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
@@ -547,9 +547,8 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, int subjec
 
 	/* Overwrite the passed-in value for subpatterns with an empty array. */
 	if (subpats != NULL) {
-		zval garbage = *subpats;
+        zval_dtor(subpats);
 		array_init(subpats);
-		zval_dtor(&garbage);
 	}
 
 	subpats_order = global ? PREG_PATTERN_ORDER : 0;

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ ZEND_API void _zval_dtor_func(zval *zvalue ZEND_FILE_LINE_DC)`
`40`	`40`	`TSRMLS_FETCH();`
`41`	`41`
`42`	`42`	`if (zvalue->value.ht && (zvalue->value.ht != &EG(symbol_table))) {`
	`43`	`+ /* break possible cycles */`
	`44`	`+ Z_TYPE_P(zvalue) = IS_NULL;`
`43`	`45`	`zend_hash_destroy(zvalue->value.ht);`
`44`	`46`	`FREE_HASHTABLE(zvalue->value.ht);`
`45`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -547,9 +547,8 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry pce, char subject, int subjec`
`547`	`547`
`548`	`548`	`/* Overwrite the passed-in value for subpatterns with an empty array. */`
`549`	`549`	`if (subpats != NULL) {`
`550`		`- zval garbage = *subpats;`
	`550`	`+ zval_dtor(subpats);`
`551`	`551`	`array_init(subpats);`
`552`		`- zval_dtor(&garbage);`
`553`	`552`	`}`
`554`	`553`
`555`	`554`	`subpats_order = global ? PREG_PATTERN_ORDER : 0;`