diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-12-29 13:49:29 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-12-29 13:54:11 +0100 |
| commit | f4d884dc6e85126c7360e8bb99a9eb64831d6672 (patch) | |
| tree | 3591f08dfff5cfb261098db4a9b79de0b061ee2d | |
| parent | 716fa9c24d8acc0bf1284a93b06a1b2c841e5a9e (diff) | |
| parent | 88d1a2c5aab441fd322683f8d21667932aeec636 (diff) | |
| download | php-git-f4d884dc6e85126c7360e8bb99a9eb64831d6672.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Revert "Fix #73530: Unsetting result set may reset other result set"
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 3 |
2 files changed, 7 insertions, 0 deletions
@@ -45,6 +45,10 @@ PHP NEWS separator). (Bob) . Fixed bug #73704 (phpdbg shows the wrong line in files with shebang). (Bob) +- 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 c8d0d9e9c7..9eaf714b96 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -2145,6 +2145,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); } |