summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2012-10-18 15:15:32 +0200
committerAndrey Hristov <andrey@php.net>2012-10-18 15:15:32 +0200
commit8219b02579097a1931ad63d4a863d854153fa64f (patch)
tree1770ccd5b574ebee3bd11c1db8867c9b98e7d7d1 /ext/pcre/php_pcre.c
parent967a1ebe5147e3892559f029a95514fd449e0c6a (diff)
parent9714ceb92b4aa6d145b6d05e3b1e20c0383bc6be (diff)
downloadphp-git-8219b02579097a1931ad63d4a863d854153fa64f.tar.gz
Merge branch 'master' of ssh://git.php.net/php-src
Diffstat (limited to 'ext/pcre/php_pcre.c')
-rw-r--r--ext/pcre/php_pcre.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 2d23737c74..6d393a26a7 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;