Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0

dstogov · dstogov · commit 99e5d6c4a5d3 · 2016-11-16T16:47:05.000+03:00
* 'PHP-7.0' of git.php.net:php-src:
diff --git a/NEWS b/NEWS
@@ -30,6 +30,9 @@ PHP                                                                        NEWS
 - SPL:
   . Fixed bug #73423 (Reproducible crash with GDB backtrace). (Laruence)
 
+- SQLite3:
+  . 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
@@ -2167,9 +2167,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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -2167,9 +2167,6 @@ static void php_sqlite3_result_object_free_storage(zend_object object) / {{{ *`
`2167`	`2167`	`}`
`2168`	`2168`
`2169`	`2169`	`if (!Z_ISNULL(intern->stmt_obj_zval)) {`
`2170`		`- if (intern->stmt_obj && intern->stmt_obj->initialised) {`
`2171`		`- sqlite3_reset(intern->stmt_obj->stmt);`
`2172`		`- }`
`2173`	`2170`
`2174`	`2171`	`zval_ptr_dtor(&intern->stmt_obj_zval);`
`2175`	`2172`	`}`