diff options
author | Xinchen Hui <laruence@php.net> | 2012-10-18 20:12:00 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@php.net> | 2012-10-18 20:12:00 +0800 |
commit | 84efca62ff505601fe9037f34dbdcf96c6ee8fd9 (patch) | |
tree | 1ace852fbc05d1be1a5aa35be2a0c1a0875d383e /ext/pcre/php_pcre.c | |
parent | 4eece4c86a74e18b916a4c052eb72c1977732828 (diff) | |
parent | 1f8fd609b0a61cc4e7815f93a0932b11b697e3a4 (diff) | |
download | php-git-84efca62ff505601fe9037f34dbdcf96c6ee8fd9.tar.gz |
Merge branch 'PHP-5.4'
Diffstat (limited to 'ext/pcre/php_pcre.c')
-rw-r--r-- | ext/pcre/php_pcre.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 2d23737c74..eb59f28d44 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -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; |