Skip to content

Commit 2ba3b27

Browse files
committed
Revert "Fix #73530: Unsetting result set may reset other result set"
This reverts commit eb57029. That commit caused a regression, so it's probably best to revert it, and to tackle the issue for the next minor release.
1 parent 79e47aa commit 2ba3b27

File tree

3 files changed

+8
-32
lines changed

3 files changed

+8
-32
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ PHP NEWS
99
. Fixed bug #68447 (grapheme_extract take an extra trailing character).
1010
(SATŌ Kentarō)
1111

12+
- SQLite3:
13+
. Reverted fix for bug #73530 (Unsetting result set may reset other result
14+
set). (cmb)
15+
1216
08 Dec 2016, PHP 5.6.29
1317

1418
- Mbstring:

ext/sqlite3/sqlite3.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,6 +2184,10 @@ static void php_sqlite3_result_object_free_storage(void *object TSRMLS_DC) /* {{
21842184
}
21852185

21862186
if (intern->stmt_obj_zval) {
2187+
if (intern->stmt_obj->initialised) {
2188+
sqlite3_reset(intern->stmt_obj->stmt);
2189+
}
2190+
21872191
if (intern->is_prepared_statement == 0) {
21882192
zval_dtor(intern->stmt_obj_zval);
21892193
FREE_ZVAL(intern->stmt_obj_zval);

ext/sqlite3/tests/bug73530.phpt

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)