archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.3' into PHP-5.4

Browse source
This commit is contained in:
Xinchen Hui 2012-10-18 20:11:32 +08:00
commit 1f8fd609b0
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_variables.c
View file

@ -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);
}

3
ext/pcre/php_pcre.c
View file

@ -555,9 +555,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;