summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--ext/sqlite3/sqlite3.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index d22471418e..90c68e23bd 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,10 @@ PHP NEWS
- Reflection:
. Fixed bug #46103 (ReflectionObject memory leak). (Nikita)
+- SQLite3:
+ . Reverted fix for bug #73530 (Unsetting result set may reset other result
+ set). (cmb)
+
- Standard:
. Fixed bug #73594 (dns_get_record does not populate $additional out parameter).
(Bruce Weirdan)
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index b3f0a29f5c..23d0b97b43 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -2167,6 +2167,9 @@ static void php_sqlite3_result_object_free_storage(zend_object *object) /* {{{ *
}
if (!Z_ISNULL(intern->stmt_obj_zval)) {
+ if (intern->stmt_obj && intern->stmt_obj->initialised) {
+ sqlite3_reset(intern->stmt_obj->stmt);
+ }
zval_ptr_dtor(&intern->stmt_obj_zval);
}