Fixed Bug #71049 (SQLite3Stmt::execute() releases bound parameter instead of internal buffer)

laruence · laruence · commit 250430acdc23 · 2015-12-07T07:43:09.000-08:00
diff --git a/NEWS b/NEWS
@@ -67,6 +67,10 @@ PHP                                                                        NEWS
 - SPL:
   . Fixed bug #71028 (Undefined index with ArrayIterator). (Laruence)
 
+- SQLite3:
+  . Fixed bug #71049 (SQLite3Stmt::execute() releases bound parameter instead
+    of internal buffer). (Laruence)
+
 - Standard:
   . Fixed bug #70999 (php_random_bytes: called object is not a function).
     (Scott)
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
@@ -1536,8 +1536,7 @@ PHP_METHOD(sqlite3stmt, execute)
 						}
 						buffer = php_stream_copy_to_mem(stream, PHP_STREAM_COPY_ALL, 0);
 					} else {
-						convert_to_string(parameter);
-						buffer = Z_STR_P(parameter);
+						buffer = zval_get_string(parameter);
 					}
 
 					if (buffer) {
diff --git a/ext/sqlite3/tests/bug71049.phpt b/ext/sqlite3/tests/bug71049.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Bug #71049 (SQLite3Stmt::execute() releases bound parameter instead of internal buffer)
+--SKIPIF--
+<?php
+if (!extension_loaded('sqlite3')) die('skip'); ?>
+--FILE--
+<?php
+
+require(__DIR__ . '/new_db.inc');
+
+$db->exec('CREATE TABLE test (age INTEGER, id STRING)');
+
+$stmt = $db->prepare("SELECT * FROM test WHERE id = ? ORDER BY id ASC");
+$foo = "alive" . chr(33);
+$stmt->bindParam(1, $foo, SQLITE3_BLOB);
+$results = $stmt->execute();
+var_dump($foo);
+$db->close();
+?>
+--EXPECT--
+string(6) "alive!"

Original file line number	Diff line number	Diff line change
`@@ -1536,8 +1536,7 @@ PHP_METHOD(sqlite3stmt, execute)`
`1536`	`1536`	`}`
`1537`	`1537`	`buffer = php_stream_copy_to_mem(stream, PHP_STREAM_COPY_ALL, 0);`
`1538`	`1538`	`} else {`
`1539`		`- convert_to_string(parameter);`
`1540`		`- buffer = Z_STR_P(parameter);`
	`1539`	`+ buffer = zval_get_string(parameter);`
`1541`	`1540`	`}`
`1542`	`1541`
`1543`	`1542`	`if (buffer) {`