com php-src: Fixed bug #69897 (segfault when manually constructing SQLite3Result): NEWS ext/sqlite3/sqlite3.c
| From: | Kalle Sommer Nielsen | Date: | Mon, 22 Jun 2015 09:12:23 +0000 |
| Subject: | com php-src: Fixed bug #69897 (segfault when manually constructing SQLite3Result): NEWS ext/sqlite3/sqlite3.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87435@lists.php.net to get a copy of this message | ||
Commit: 0da4c34f0e5957f4370a22bfcc0043efb1f59955
Author: Kalle Sommer Nielsen <kalle@php.net> Mon, 22 Jun 2015 11:12:23 +0200
Parents: ed418312a5937389c3b2aa486291bfeb5ffde4c2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0da4c34f0e5957f4370a22bfcc0043efb1f59955
Log:
Fixed bug #69897 (segfault when manually constructing SQLite3Result)
Bugs:
https://bugs.php.net/69897
Changed paths:
M NEWS
M ext/sqlite3/sqlite3.c
Diff:
diff --git a/NEWS b/NEWS
index da75836..7e60435 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-PHP NEWS
+PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
25 Jun 2015, PHP 7.0.0 Alpha 2
@@ -57,6 +57,10 @@ PHP NEWS
- SPL
. Fixed bug #69845 (ArrayObject with ARRAY_AS_PROPS broken). (Dmitry)
+- SQLite3
+ . Fixed bug #69897 (segfault when manually constructing SQLite3Result).
+ (Kalle)
+
- Standard
. Fixed bug #62922 (Truncating entire string should result in string).
(Nikita)
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index f9bcb31..0056045 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -2103,7 +2103,7 @@ static void php_sqlite3_result_object_free_storage(zend_object *object) /* {{{
*
}
if (!Z_ISNULL(intern->stmt_obj_zval)) {
- if (intern->stmt_obj->initialised) {
+ if (intern->stmt_obj && intern->stmt_obj->initialised) {
sqlite3_reset(intern->stmt_obj->stmt);
}