com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend_execute_API.c
| From: | Dmitry Stogov | Date: | Wed, 08 Apr 2015 18:24:24 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86137@lists.php.net to get a copy of this message | ||
Commit: 1f5f78d4aa873ac16b8165a1614f5e0c54a3198b
Author: Dmitry Stogov <dmitry@zend.com> Wed, 8 Apr 2015 21:24:24 +0300
Parents: f5c8a79fa511fddbfd5499e24399d6e8348dd3ce 741c5e4c0c4d666469215d21de8a743a6b292fa2
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f5f78d4aa873ac16b8165a1614f5e0c54a3198b
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
Bugs:
https://bugs.php.net/67314
Changed paths:
MM NEWS
MM Zend/zend_execute_API.c
Diff:
diff --cc NEWS
index bacfa36,f28c88e..0c4220d
--- a/NEWS
+++ b/NEWS
@@@ -5,8 -5,16 +5,10 @@@ PH
- Core:
.. Fixed bug #60022 ("use statement [...] has no effect" depends on leading
backslash). (Nikita)
+ . Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer).
+ (Dmitry)
. Fixed bug #68652 (segmentation fault in destructor). (Dmitry)
-- cURL:
- . Fixed bug #68739 (Missing break / control flow). (Laruence)
-
-- Ereg:
- . Fixed bug #68740 (NULL Pointer Dereference). (Laruence)
-
- ODBC:
. Fixed bug #69354 (Incorrect use of SQLColAttributes with ODBC 3.0).
(Anatol)