Skip to content

ext/mysqli: Fix memory leak and missing error handling in mysqli_poll. #21408

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.

Sign up for GitHub

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
devnexen wants to merge 3 commits into
base: PHP-8.4
Choose a base branch
from
Open

ext/mysqli: Fix memory leak and missing error handling in mysqli_poll. #21408

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c7e16c
ext/mysqli: Fix memory leak and missing error handling in mysqli_poll.
devnexen Mar 10, 2026
d980908
review, using assertion instead
devnexen Mar 11, 2026
e19c24e
no more ..
devnexen Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions ext/mysqli/mysqli_nonapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ static zend_result mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND *
/* }}} */

/* {{{ mysqlnd_zval_array_from_mysqlnd_array */
static zend_result mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *out_array)
static void mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *out_array)
{
MYSQLND **p = in_array;
zval dest_array;
Expand All @@ -686,10 +686,8 @@ static zend_result mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zva
MY_MYSQL *mysql;
MYSQLI_RESOURCE *my_res;
mysqli_object *intern = Z_MYSQLI_P(elem);
if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {
zend_throw_error(NULL, "%s object is already closed", ZSTR_VAL(intern->zo.ce->name));
return FAILURE;
}
my_res = (MYSQLI_RESOURCE *)intern->ptr;
ZEND_ASSERT(my_res);
Copy link
Member

@ndossche ndossche Mar 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And because this is now an assertion, the function can only ever return SUCCESS, making the return value unnecessary.

Copy link
Member Author

@devnexen devnexen Mar 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes I realise those are only internal helpers not APIS ...

mysql = (MY_MYSQL *) my_res->ptr;
if (mysql->mysql == *p) {
dest_elem = zend_hash_next_index_insert(Z_ARRVAL(dest_array), elem);
Expand All @@ -704,8 +702,6 @@ static zend_result mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zva
/* destroy old array and add new one */
zval_ptr_dtor(out_array);
ZVAL_COPY_VALUE(out_array, &dest_array);

return SUCCESS;
}
/* }}} */

Expand Down
Loading