MFH

helly25 · helly25 · commit 247f707d55c1 · 2004-04-22T22:52:54.000Z
diff --git 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
@@ -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===

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,9 @@ static void real_result_dtor(struct php_sqlite_result *res TSRMLS_DC)`
`257`	`257`	`efree(res->col_names);`
`258`	`258`	`}`
`259`	`259`
`260`		`- zend_list_delete(res->db->rsrc_id);`
	`260`	`+ if (res->db) {`
	`261`	`+ zend_list_delete(res->db->rsrc_id);`
	`262`	`+ }`
`261`	`263`	`efree(res);`
`262`	`264`	`}`
`263`	`265`