diff options
| author | Marcus Boerger <helly@php.net> | 2004-04-22 22:52:54 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2004-04-22 22:52:54 +0000 |
| commit | 247f707d55c10ca9e29552636b531a06eece919d (patch) | |
| tree | 0c6cf72d96620ac3f25c6761ec7c9e26019cb10c | |
| parent | 437c5569264a964045e7a7ce0d13609cb778bdff (diff) | |
| download | php-git-247f707d55c10ca9e29552636b531a06eece919d.tar.gz | |
MFH
| -rw-r--r-- | ext/sqlite/sqlite.c | 4 | ||||
| -rwxr-xr-x | 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=== |