com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/sqlite3/sqlite3.c
| From: | Stanislav Malyshev | Date: | Mon, 06 Apr 2015 05:38:20 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/sqlite3/sqlite3.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86094@lists.php.net to get a copy of this message | ||
Commit: 2a81733c87d9d62becc46add120c41c4818396ca
Author: Stanislav Malyshev <stas@php.net> Sun, 5 Apr 2015 22:38:03 -0700
Parents: c167029eb6d22563ddc2a4b32588e25d8ad74ac4 66b853d4261a813287ab5e379392e418bf715e82
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2a81733c87d9d62becc46add120c41c4818396ca
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #66550 (SQLite prepared statement use-after-free)
Bugs:
https://bugs.php.net/66550
Changed paths:
MM NEWS
MM ext/sqlite3/sqlite3.c
Diff:
diff --cc NEWS
index 6149687,2bc4f7c..fe6100b
--- a/NEWS
+++ b/NEWS
@@@ -6,7 -12,14 +6,10 @@@ PH
. Fixed bug #69354 (Incorrect use of SQLColAttributes with ODBC 3.0).
(Anatol)
-- OPCache:
- . Fixed bug #69281 (opcache_is_script_cached no longer works). (danack)
- . Fixed bug #68677 (Use After Free). (CVE-2015-1351) (Laruence)
-
+ - Sqlite3:
+ . Fixed bug #66550 (SQLite prepared statement use-after-free). (Sean Heelan)
+
-?? ??? 2015, PHP 5.5.24
+16 Apr 2015, PHP 5.6.8
- Core:
. Fixed bug #66609 (php crashes with __get() and ++ operator in some cases).