diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-12-29 13:31:18 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-12-29 13:47:28 +0100 |
| commit | 88d1a2c5aab441fd322683f8d21667932aeec636 (patch) | |
| tree | fe7725d6ae59aa0eb60154f240a923d57f5be61f /ext/sqlite3/sqlite3.c | |
| parent | a8931df672bb173ef81c10e4fc2a5de23789c935 (diff) | |
| parent | 2ba3b275948050ce600c5234b66e840b640ca5a5 (diff) | |
| download | php-git-88d1a2c5aab441fd322683f8d21667932aeec636.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Revert "Fix #73530: Unsetting result set may reset other result set"
# Conflicts:
# ext/sqlite3/sqlite3.c
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 3 |
1 files changed, 3 insertions, 0 deletions
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); } |