Skip to content

Mysqli mem fixes #21930

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 2 commits into
base: PHP-8.4
Choose a base branch
from
+45 −0
Open

Mysqli mem fixes #21930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c59735
ext/mysqli: Fix stmt->query leak in mysqli_execute_query() validation…
devnexen May 2, 2026
24b40bc
add test
devnexen May 2, 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
8 changes: 8 additions & 0 deletions ext/mysqli/mysqli_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,10 @@ PHP_FUNCTION(mysqli_execute_query)
MYSQLND_PARAM_BIND *params;

if (!zend_array_is_list(input_params)) {
if (stmt->query) {
efree(stmt->query);
stmt->query = NULL;
}
mysqli_stmt_close(stmt->stmt, false);
stmt->stmt = NULL;
efree(stmt);
Expand All @@ -542,6 +546,10 @@ PHP_FUNCTION(mysqli_execute_query)
hash_num_elements = zend_hash_num_elements(input_params);
param_count = mysql_stmt_param_count(stmt->stmt);
if (hash_num_elements != param_count) {
if (stmt->query) {
efree(stmt->query);
stmt->query = NULL;
}
mysqli_stmt_close(stmt->stmt, false);
stmt->stmt = NULL;
efree(stmt);
Expand Down
37 changes: 37 additions & 0 deletions ext/mysqli/tests/mysqli_execute_query_leak.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
--TEST--
mysqli_execute_query() does not leak stmt->query on input_params validation errors with MYSQLI_REPORT_INDEX
--EXTENSIONS--
mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
?>
--FILE--
<?php

require 'table.inc';

mysqli_report(MYSQLI_REPORT_INDEX);

try {
$link->execute_query('SELECT label, ? AS anon, ? AS num FROM test WHERE id=?', ['foo', 42]);
} catch (ValueError $e) {
echo '[001] '.$e->getMessage()."\n";
}

try {
$link->execute_query('SELECT label, ? AS anon, ? AS num FROM test WHERE id=?', ['foo' => 42]);
} catch (ValueError $e) {
echo '[002] '.$e->getMessage()."\n";
}

print "done!";
?>
--CLEAN--
<?php
require_once 'clean_table.inc';
?>
--EXPECT--
[001] mysqli::execute_query(): Argument #2 ($params) must consist of exactly 3 elements, 2 present
[002] mysqli::execute_query(): Argument #2 ($params) must be a list array
done!
Loading