diff options
| author | Xinchen Hui <laruence@php.net> | 2012-10-18 17:32:48 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-10-18 17:33:52 +0800 |
| commit | 54cef2bb6d4d0527ac161b900b0b475d2ce312fb (patch) | |
| tree | c07cf3d48017f554a6b82687e9ba0078878c5252 /ext/pcre/php_pcre.c | |
| parent | 4d509708a454c736a2f15f1a4ec7567c26659086 (diff) | |
| parent | 8bd5e15ff7a57791956c4017ee8fb4a8ac0d8d2e (diff) | |
| download | php-git-54cef2bb6d4d0527ac161b900b0b475d2ce312fb.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index f61364cde9..4daed05ba1 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -555,8 +555,9 @@ 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_dtor(subpats); + zval garbage = *subpats; array_init(subpats); + zval_dtor(&garbage); } subpats_order = global ? PREG_PATTERN_ORDER : 0; |