com php-src: Fix bug #67433 SIGSEGV when using count() on an object implementing Countable: NEWS ext/standard/array.c
| From: | Matteo Beccati | Date: | Fri, 13 Jun 2014 11:14:12 +0000 |
| Subject: | com php-src: Fix bug #67433 SIGSEGV when using count() on an object implementing Countable: NEWS ext/standard/array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78870@lists.php.net to get a copy of this message | ||
Commit: df5551ba4f1aae8486b3c4011318188fde7e30cd
Author: Matteo Beccati <mbeccati@php.net> Fri, 13 Jun 2014 13:14:12 +0200
Parents: 84f339546a623346e59ec5ba62fdc98fb7d7ecb2
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=df5551ba4f1aae8486b3c4011318188fde7e30cd
Log:
Fix bug #67433 SIGSEGV when using count() on an object implementing Countable
Bugs:
https://bugs.php.net/67433
Changed paths:
M NEWS
M ext/standard/array.c
Diff:
diff --git a/NEWS b/NEWS
index 490ccea..38a0579 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ PHP NEWS
. Fixed bug #67392 (dtrace breaks argument unpack). (Nikita)
. Fixed bug #67428 (header('Location: foo') will override a 308-399 response
code). (Adam)
+ . Fixed bug #67433 (SIGSEGV when using count() on an object implementing
+ Countable). (Matteo)
- CLI server:
. Implemented FR #67429 (CLI server is missing some new HTTP response codes).
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 4f98331..cbcaaf5 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