-
Notifications
You must be signed in to change notification settings - Fork 7.9k
sqlite3: Fix double execution of queries when fetchArray is called #8942
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
maaarghk
wants to merge
2
commits into
php:master
Choose a base branch
from
maaarghk:bug64531
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| --TEST-- | ||
| Bug #64531 (SQLite3Result::fetchArray runs the query again) - SQLite3->query | ||
| --SKIPIF-- | ||
| <?php | ||
| if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not available'); | ||
| ?> | ||
| --FILE-- | ||
| <?php | ||
| $conn = new SQLite3(':memory:'); | ||
| $conn->exec("CREATE TABLE foo (id INT)"); | ||
|
|
||
| $res = $conn->query("INSERT INTO foo VALUES (1)"); | ||
|
|
||
| $res->fetchArray(); | ||
| $res->fetchArray(); | ||
|
|
||
| $res = $conn->query("SELECT * FROM foo"); | ||
| while (($row = $res->fetchArray(SQLITE3_NUM))) { | ||
| var_dump($row); | ||
| } | ||
| ?> | ||
| --EXPECT-- | ||
| array(1) { | ||
| [0]=> | ||
| int(1) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| --TEST-- | ||
| Bug #64531 (SQLite3Result::fetchArray runs the query again) - SQLite3->query | ||
| --SKIPIF-- | ||
| <?php | ||
| if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not available'); | ||
| ?> | ||
| --FILE-- | ||
| <?php | ||
| function testing($val) { | ||
| echo "Testing with: $val\n"; | ||
| return true; | ||
| } | ||
|
|
||
| $conn = new SQLite3(':memory:'); | ||
| $conn->exec("CREATE TABLE foo (id INT)"); | ||
| for ($i = 1; $i <= 3; $i++) { | ||
| $conn->exec("INSERT INTO foo VALUES ($i)"); | ||
| } | ||
| $conn->createFunction('testing', 'testing', 1); | ||
|
|
||
| $res = $conn->query('SELECT * FROM foo WHERE testing(id)'); | ||
| $arr = $res->fetchArray(); | ||
| $arr = $res->fetchArray(); | ||
| $arr = $res->fetchArray(); | ||
| $arr = $res->fetchArray(); | ||
| ?> | ||
| --EXPECT-- | ||
| Testing with: 1 | ||
| Testing with: 2 | ||
| Testing with: 3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| --TEST-- | ||
| Bug #64531 (SQLite3Result::fetchArray runs the query again) - SQLite3Stmt->execute | ||
| --SKIPIF-- | ||
| <?php | ||
| if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not available'); | ||
| ?> | ||
| --FILE-- | ||
| <?php | ||
| $conn = new SQLite3(':memory:'); | ||
| $conn->exec("CREATE TABLE foo (id INT)"); | ||
|
|
||
| $stmt = $conn->prepare("INSERT INTO foo VALUES (1)"); | ||
| $res = $stmt->execute(); | ||
| $res->fetchArray(); | ||
| $res->fetchArray(); | ||
|
|
||
| $res = $conn->query("SELECT * FROM foo"); | ||
| while (($row = $res->fetchArray(SQLITE3_NUM))) { | ||
| var_dump($row); | ||
| } | ||
| ?> | ||
| --EXPECT-- | ||
| array(1) { | ||
| [0]=> | ||
| int(1) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| --TEST-- | ||
| Bug #64531 (SQLite3Result::fetchArray runs the query again) - SQLite3Stmt->execute (reused) | ||
| --SKIPIF-- | ||
| <?php | ||
| if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not available'); | ||
| ?> | ||
| --FILE-- | ||
| <?php | ||
| $conn = new SQLite3(':memory:'); | ||
| $conn->exec("CREATE TABLE foo (id INT)"); | ||
|
|
||
| function testing($val) { | ||
| echo $val; | ||
| debug_print_backtrace(); | ||
| return $val; | ||
| } | ||
|
|
||
| $conn->createFunction('testing', 'testing', 1); | ||
|
|
||
| $stmt = $conn->prepare("INSERT INTO foo VALUES (testing(?))"); | ||
|
|
||
| $stmt->bindValue(1, 1); | ||
|
|
||
| $res = $stmt->execute(); // Should run | ||
| $res->fetchArray(); // Should not run | ||
| $res->fetchArray(); // Should not run | ||
| $res->fetchArray(); // Should not run | ||
|
|
||
| $stmt->bindValue(1, 2); | ||
|
|
||
| $res = $stmt->execute(); // Should run | ||
| $res->fetchArray(); // Should not run | ||
| $res->fetchArray(); // Should not run | ||
| $res->fetchArray(); // Should not run | ||
|
|
||
| $stmt->bindValue(1, 3); | ||
|
|
||
| $res2 = $stmt->execute(); // Should run | ||
| $res2->fetchArray(); // Should not run | ||
| $res2->fetchArray(); // Should not run | ||
| $res2->fetchArray(); // Should not run | ||
|
|
||
| $res = $conn->query("SELECT * FROM foo"); | ||
| while (($row = $res->fetchArray(SQLITE3_NUM))) { | ||
| var_dump($row); | ||
| } | ||
| ?> | ||
| --EXPECTF-- | ||
| 1#0 [internal function]: testing(1) | ||
| #1 %s(17): SQLite3Stmt->execute() | ||
| 2#0 [internal function]: testing(2) | ||
| #1 %s(24): SQLite3Stmt->execute() | ||
| 3#0 [internal function]: testing(3) | ||
| #1 %s(31): SQLite3Stmt->execute() | ||
| array(1) { | ||
| [0]=> | ||
| int(1) | ||
| } | ||
| array(1) { | ||
| [0]=> | ||
| int(2) | ||
| } | ||
| array(1) { | ||
| [0]=> | ||
| int(3) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| --TEST-- | ||
| Bug #64531 (SQLite3Result::fetchArray runs the query again) - SQLite3Stmt->prepare | ||
| --SKIPIF-- | ||
| <?php | ||
| if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not available'); | ||
| ?> | ||
| --FILE-- | ||
| <?php | ||
| function testing($val) { | ||
| echo "Testing with: $val\n"; | ||
| return true; | ||
| } | ||
|
|
||
| $conn = new SQLite3(':memory:'); | ||
| $conn->exec("CREATE TABLE foo (id INT)"); | ||
| for ($i = 1; $i <= 3; $i++) { | ||
| $conn->exec("INSERT INTO foo VALUES ($i)"); | ||
| } | ||
| $conn->createFunction('testing', 'testing', 1); | ||
|
|
||
| $stmt = $conn->prepare("SELECT * FROM foo WHERE testing(id)"); | ||
| $res = $stmt->execute(); | ||
| $arr = $res->fetchArray(); | ||
| $arr = $res->fetchArray(); | ||
| $arr = $res->fetchArray(); | ||
| $arr = $res->fetchArray(); | ||
| ?> | ||
| --EXPECT-- | ||
| Testing with: 1 | ||
| Testing with: 2 | ||
| Testing with: 3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| --TEST-- | ||
| Bug #79293 (SQLite3Result::fetchArray() may fetch rows after last row) | ||
| --SKIPIF-- | ||
| <?php | ||
| if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not available'); | ||
| ?> | ||
| --FILE-- | ||
| <?php | ||
| $db = new SQLite3(':memory:'); | ||
| $db->exec("CREATE TABLE foo (bar INT)"); | ||
| for ($i = 1; $i <= 3; $i++) { | ||
| $db->exec("INSERT INTO foo VALUES ($i)"); | ||
| } | ||
|
|
||
| $res = $db->query("SELECT * FROM foo"); | ||
| while (($row = $res->fetchArray(SQLITE3_ASSOC))) { | ||
| var_dump($row); | ||
| } | ||
| var_dump($res->fetchArray(SQLITE3_ASSOC)); | ||
| ?> | ||
| --EXPECT-- | ||
| array(1) { | ||
| ["bar"]=> | ||
| int(1) | ||
| } | ||
| array(1) { | ||
| ["bar"]=> | ||
| int(2) | ||
| } | ||
| array(1) { | ||
| ["bar"]=> | ||
| int(3) | ||
| } | ||
| bool(false) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the bit I'm unsure about - to me it makes sense logically that we are only safe to reset the statement if the refcount on it is 0, but grepping the rest of the codebase I don't see much precedent for checking refcounts from extensions.
But, that said, the statement object is already inside free_list so we can be reasonably assured that it will be reset at some later point - so can we just remove this? if I remove this entire
if (intern->stmt_objblock, I don't get any complaints from a debug build about detected memory leaks.