archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/pdo_sqlite: createCollation memory leaks fix.

Browse source 
coming from callback arguments when its return type is incorrect.

close GH-18796
This commit is contained in:
David Carlier 2025-06-07 13:31:55 +01:00
parent c772963c9c
commit 1044558b64
No known key found for this signature in database
GPG key ID: 8486F847B4B94EF1
3 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/pdo_sqlite/pdo_sqlite.c
View file

@ -346,6 +346,9 @@ static int php_sqlite_collation_callback(void *context, int string1_len, const v
zend_call_known_fcc(&collation->callback, &retval, /* argc */ 2, zargs, /* named_params */ NULL);
zval_ptr_dtor(&zargs[0]);
zval_ptr_dtor(&zargs[1]);
if (!Z_ISUNDEF(retval)) {
if (Z_TYPE(retval) != IS_LONG) {
zend_string *func_name = get_active_function_or_method_name();
@ -362,9 +365,6 @@ static int php_sqlite_collation_callback(void *context, int string1_len, const v
}
}
zval_ptr_dtor(&zargs[0]);
zval_ptr_dtor(&zargs[1]);
return ret;
}

24
ext/pdo_sqlite/tests/subclasses/pdo_sqlite_createcollation_wrong_callback.phpt Normal file
View file

@ -0,0 +1,24 @@
--TEST--
Pdo\Sqlite::createCollation() memory leaks on wrong callback return type
--EXTENSIONS--
pdo_sqlite
--FILE--
<?php
declare(strict_types=1);
$db = new Pdo\Sqlite('sqlite::memory:');
$db->exec("CREATE TABLE test (c string)");
$db->exec("INSERT INTO test VALUES('youwontseeme')");
$db->exec("INSERT INTO test VALUES('neither')");
$db->createCollation('NAT', function($a, $b): string { return $a . $b; });
try {
$db->query("SELECT c FROM test ORDER BY c COLLATE NAT");
} catch (\TypeError $e) {
echo $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
PDO::query(): Return value of the callback must be of type int, string returned