ext/sqlite3: Use new F ZPP modifier #14040
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| --TEST-- | ||
| SQLite3::createAggregate() use F ZPP for trampoline callback and does not leak | ||
| --EXTENSIONS-- | ||
| sqlite3 | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| require_once(__DIR__ . '/new_db.inc'); | ||
|
|
||
| class TrampolineTest { | ||
| public function __call(string $name, array $arguments) { | ||
| echo 'Trampoline for ', $name, PHP_EOL; | ||
| $context = $arguments[0]; | ||
| if ($name === 'finalize') { | ||
| return implode(',', $context['values']); | ||
| } | ||
| if (empty($context)) { | ||
| $context = ['total' => 0, 'values' => []]; | ||
| } | ||
| $context['total'] += (int) $arguments[2]; | ||
| $context['values'][] = $context['total']; | ||
| return $context; | ||
| } | ||
| } | ||
| $o = new TrampolineTest(); | ||
| $step = [$o, 'step']; | ||
| $finalize = [$o, 'finalize']; | ||
|
|
||
| var_dump($db->createAggregate('', $step, $finalize, 1)); | ||
|
|
||
| try { | ||
| var_dump($db->createAggregate(new stdClass(), $step, $finalize, new stdClass())); | ||
| } catch (\Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), PHP_EOL; | ||
| } | ||
| try { | ||
| var_dump($db->createAggregate('S', $step, $finalize, new stdClass())); | ||
| } catch (\Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), PHP_EOL; | ||
| } | ||
| try { | ||
| var_dump($db->createAggregate('S', $step, 'no_func', 1)); | ||
| } catch (\Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), PHP_EOL; | ||
| } | ||
| try { | ||
| var_dump($db->createAggregate('S', 'no_func', $finalize, 1)); | ||
| } catch (\Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), PHP_EOL; | ||
| } | ||
|
|
||
| try { | ||
| var_dump($db->createAggregate('S', $step, $finalize, 'not a number')); | ||
| } catch (\Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), PHP_EOL; | ||
| } | ||
|
|
||
| echo "Invalid SQLite3 object:\n"; | ||
| $rc = new ReflectionClass(SQLite3::class); | ||
| $obj = $rc->newInstanceWithoutConstructor(); | ||
|
|
||
| try { | ||
| var_dump($obj->createAggregate('S', $step, $finalize, 1)); | ||
| } catch (\Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), PHP_EOL; | ||
| } | ||
|
|
||
| var_dump($db->createAggregate('S', $step, $finalize, 1)); | ||
|
|
||
| echo "Closing database\n"; | ||
| var_dump($db->close()); | ||
| echo "Done\n"; | ||
| ?> | ||
| --EXPECT-- | ||
| bool(false) | ||
| TypeError: SQLite3::createAggregate(): Argument #1 ($name) must be of type string, stdClass given | ||
| TypeError: SQLite3::createAggregate(): Argument #4 ($argCount) must be of type int, stdClass given | ||
| TypeError: SQLite3::createAggregate(): Argument #3 ($finalCallback) must be a valid callback, function "no_func" not found or invalid function name | ||
| TypeError: SQLite3::createAggregate(): Argument #2 ($stepCallback) must be a valid callback, function "no_func" not found or invalid function name | ||
| TypeError: SQLite3::createAggregate(): Argument #4 ($argCount) must be of type int, string given | ||
| Invalid SQLite3 object: | ||
| Error: The SQLite3 object has not been correctly initialised or is already closed | ||
| bool(true) | ||
| Closing database | ||
| bool(true) | ||
| Done |
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,51 @@ | ||
| --TEST-- | ||
| SQLite3::createFunction use F ZPP for trampoline callback and does not leak | ||
| --EXTENSIONS-- | ||
| sqlite3 | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| require_once(__DIR__ . '/new_db.inc'); | ||
|
|
||
| class TrampolineTest { | ||
| public function __call(string $name, array $arguments) { | ||
| echo 'Trampoline for ', $name, PHP_EOL; | ||
| return strnatcmp(...$arguments); | ||
| } | ||
| } | ||
| $o = new TrampolineTest(); | ||
| $callback = [$o, 'NAT']; | ||
|
|
||
| var_dump($db->createCollation('', $callback)); | ||
|
|
||
| try { | ||
| var_dump($db->createCollation(new stdClass(), $callback)); | ||
| } catch (\Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), PHP_EOL; | ||
| } | ||
| try { | ||
| var_dump($db->createCollation('NAT', $callback, new stdClass())); | ||
| } catch (\Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), PHP_EOL; | ||
| } | ||
|
|
||
| echo "Invalid SQLite3 object:\n"; | ||
| $rc = new ReflectionClass(SQLite3::class); | ||
| $obj = $rc->newInstanceWithoutConstructor(); | ||
|
|
||
| try { | ||
| var_dump($obj->createCollation('NAT', $callback)); | ||
| } catch (\Throwable $e) { | ||
| echo $e::class, ': ', $e->getMessage(), PHP_EOL; | ||
| } | ||
|
|
||
| var_dump($db->createCollation('NAT', $callback)); | ||
|
|
||
| ?> | ||
| --EXPECT-- | ||
| bool(false) | ||
| TypeError: SQLite3::createCollation(): Argument #1 ($name) must be of type string, stdClass given | ||
| ArgumentCountError: SQLite3::createCollation() expects exactly 2 arguments, 3 given | ||
| Invalid SQLite3 object: | ||
| Error: The SQLite3 object has not been correctly initialised or is already closed | ||
| bool(true) |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.