archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source
This commit is contained in:
David Carlier 2025-06-07 14:29:13 +01:00
commit b72dccb3e3
No known key found for this signature in database
GPG key ID: 8486F847B4B94EF1
2 changed files with 27 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

@ -376,6 +376,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();
@ -392,9 +395,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;
}