diff options
| author | Matteo Beccati <mbeccati@php.net> | 2014-06-13 13:14:52 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2014-06-13 13:14:52 +0200 |
| commit | 7d2bcbe20c5e64b967a9bee739913c72aeaf07f9 (patch) | |
| tree | c9496179542c78d57afc4a19f5b0e10a2da3dc23 | |
| parent | 64f85d5afa11b2566f1115b7ed8c554d7e839a32 (diff) | |
| parent | df5551ba4f1aae8486b3c4011318188fde7e30cd (diff) | |
| download | php-git-7d2bcbe20c5e64b967a9bee739913c72aeaf07f9.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #67433 SIGSEGV when using count() on an object implementing Countable
| -rw-r--r-- | ext/standard/array.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 450e6995c2..54e8951f23 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -342,8 +342,7 @@ PHP_FUNCTION(count) RETVAL_LONG(Z_LVAL_P(retval)); zval_ptr_dtor(&retval); } - zval_dtor(mode_zv); - efree(mode_zv); + zval_ptr_dtor(&mode_zv); return; } #endif |