From: Kalle Sommer Nielsen <kalle@php.net>
Date: Mon, 22 Jun 2015 09:12:23 +0000 (+0200)
Subject: Fixed bug #69897 (segfault when manually constructing SQLite3Result)
X-Git-Tag: php-7.0.0alpha2~2^2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0da4c34f0e5957f4370a22bfcc0043efb1f59955;p=php

Fixed bug #69897 (segfault when manually constructing SQLite3Result)
---

diff --git a/NEWS b/NEWS
index da7583664a..7e60435848 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 f9bcb311f5..00560450fe 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);
 		}