diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-11-16 12:01:55 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-11-16 12:02:29 +0100 |
| commit | c5abb873221e549f02ba0a7bbcc0a47e036e681e (patch) | |
| tree | b98850dd1b1ebb4c6928caae4ed30fb09bc1d5aa | |
| parent | 5eeec01bae9cc2ec380eb1961d623e4d37cee2f2 (diff) | |
| parent | 936cafe33e3115ea04df7902d6eac8d9f63f7fb6 (diff) | |
| download | php-git-c5abb873221e549f02ba0a7bbcc0a47e036e681e.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 3 | ||||
| -rw-r--r-- | ext/sqlite3/tests/bug73530.phpt | 32 |
3 files changed, 33 insertions, 3 deletions
@@ -16,6 +16,7 @@ PHP NEWS - SQLite3: . Update to SQLite 3.15.1. (cmb) + . Fixed bug #73530 (Unsetting result set may reset other result set). (cmb) - XML: . Fixed bug #72135 (malformed XML causes fault) (edgarsandi) diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 9eaf714b96..c8d0d9e9c7 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -2145,9 +2145,6 @@ 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); } diff --git a/ext/sqlite3/tests/bug73530.phpt b/ext/sqlite3/tests/bug73530.phpt new file mode 100644 index 0000000000..7e17dfecd3 --- /dev/null +++ b/ext/sqlite3/tests/bug73530.phpt @@ -0,0 +1,32 @@ +--TEST--
+Bug #73530 (Unsetting result set may reset other result set)
+--SKIPIF--
+<?php
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not available');
+?>
+--FILE--
+<?php
+$db = new SQLite3(':memory:');
+$db->exec("CREATE TABLE foo (num int)");
+$db->exec("INSERT INTO foo VALUES (0)");
+$db->exec("INSERT INTO foo VALUES (1)");
+$stmt = $db->prepare("SELECT * FROM foo WHERE NUM = ?");
+$stmt->bindValue(1, 0, SQLITE3_INTEGER);
+$res1 = $stmt->execute();
+$res1->finalize();
+$stmt->clear();
+$stmt->reset();
+$stmt->bindValue(1, 1, SQLITE3_INTEGER);
+$res2 = $stmt->execute();
+while ($row = $res2->fetchArray(SQLITE3_ASSOC)) {
+ var_dump($row);
+ unset($res1);
+}
+?>
+===DONE===
+--EXPECT--
+array(1) {
+ ["num"]=>
+ int(1)
+}
+===DONE===
|