mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
ext/pdo_sqlite: createCollation memory leaks fix.
coming from callback arguments when its return type is incorrect. close GH-18796
This commit is contained in:
parent
c772963c9c
commit
1044558b64
3 changed files with 31 additions and 3 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue