From 247f707d55c10ca9e29552636b531a06eece919d Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Thu, 22 Apr 2004 22:52:54 +0000
Subject: MFH

---
 ext/sqlite/sqlite.c            | 4 +++-
 ext/sqlite/tests/bug28112.phpt | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 158d3ff996..18666e2906 100644
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -257,7 +257,9 @@ static void real_result_dtor(struct php_sqlite_result *res TSRMLS_DC)
 		efree(res->col_names);
 	}
 
-	zend_list_delete(res->db->rsrc_id);
+	if (res->db) {
+		zend_list_delete(res->db->rsrc_id);
+	}
 	efree(res);
 }
 
diff --git a/ext/sqlite/tests/bug28112.phpt b/ext/sqlite/tests/bug28112.phpt
index 551e61764e..05c8ff81f3 100755
--- a/ext/sqlite/tests/bug28112.phpt
+++ b/ext/sqlite/tests/bug28112.phpt
@@ -1,11 +1,11 @@
 --TEST--
-#28112 (sqlite_query() crashing apache on malformed query)
+Bug #28112 (sqlite_query() crashing apache on malformed query)
 --FILE--
 <?php
 
 if (!($db = sqlite_open(":memory:", 666, $error))) die ("Couldn't open the database");
 sqlite_query($db, "create table frob (foo INTEGER PRIMARY KEY, bar text);");
-$res = sqlite_array_query($db, "");
+$res = @sqlite_array_query($db, "");
 
 ?>
 ===DONE===
-- 
cgit v1.2.1