summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--ext/sqlite/sqlite.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 50ea9dbf14..952dd6a62e 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,8 @@ PHP NEWS
- Fixed Bug #36872 (session_destroy() fails after call to
session_regenerate_id(true)). (Ilia)
- Fixed bug #36513 (comment will be outputed in last line). (Dmitry)
+- Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever).
+ (Ilia)
06 Apr 2006, PHP 5.1.3RC3
- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry)
diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index fb97233695..c3d585857a 100644
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -1705,7 +1705,9 @@ PHP_FUNCTION(sqlite_fetch_column_types)
add_index_string(return_value, i, colnames[ncols + i] ? (char *)colnames[ncols + i] : "", 1);
}
}
-
+ if (res.vm) {
+ sqlite_finalize(res.vm, NULL);
+ }
done:
sqlite_exec(db->db, "PRAGMA show_datatypes = OFF", NULL, NULL, NULL);
}