diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-12-29 12:41:39 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-12-29 12:59:04 +0100 |
| commit | 2ba3b275948050ce600c5234b66e840b640ca5a5 (patch) | |
| tree | ee8e714784de9c12e6494ba78ac0798cbd3b64ed /ext/sqlite3/sqlite3.c | |
| parent | 79e47aae4100accd3141357ca2e7d8dc9981da6f (diff) | |
| download | php-git-2ba3b275948050ce600c5234b66e840b640ca5a5.tar.gz | |
Revert "Fix #73530: Unsetting result set may reset other result set"
This reverts commit eb570294a289b45d0dd38efc71065d6b0d314c4b.
That commit caused a regression, so it's probably best to revert it, and
to tackle the issue for the next minor release.
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index b443657e3c..80d6b897f1 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -2184,6 +2184,10 @@ static void php_sqlite3_result_object_free_storage(void *object TSRMLS_DC) /* {{ } if (intern->stmt_obj_zval) { + if (intern->stmt_obj->initialised) { + sqlite3_reset(intern->stmt_obj->stmt); + } + if (intern->is_prepared_statement == 0) { zval_dtor(intern->stmt_obj_zval); FREE_ZVAL(intern->stmt_obj_zval); |