Skip to content

ext/mysqlnd: Reset field_count for ok packet #23890

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

Merged
kamil-tekiela merged 1 commit into from
Sep 29, 2026
Merged

ext/mysqlnd: Reset field_count for ok packet #23890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ PHP NEWS
. Fix GH-22854: Fixed failed assertion when accessing mysqli property after
failed reconnection. (Kamil Tekiela)

- MySQLnd:
. Fixed field_count not resetting on OK packet. (Kamil Tekiela)

- Opcache:
. Fixed OSS-Fuzz #546798343 (Heap-buffer-overflow in optimizer with
FCCs and inlining). (ndossche)
Expand Down
34 changes: 34 additions & 0 deletions ext/mysqli/tests/mysqli_stmt_next_result_field_count.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
--TEST--
mysqli_stmt::$field_count is 0 for the trailing OK packet of a stored procedure
--EXTENSIONS--
mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
?>
--FILE--
<?php
require_once 'connect.inc';

mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
$link->query('DROP PROCEDURE IF EXISTS test_field_count_p');
$link->query('CREATE PROCEDURE test_field_count_p() BEGIN SELECT 1 AS a; SELECT 2 AS b, 3 AS c; END');

$stmt = $link->prepare('CALL test_field_count_p()');
$stmt->execute();
do {
var_dump($stmt->field_count);
$stmt->get_result();
} while ($stmt->next_result());
?>
--CLEAN--
<?php
require_once 'connect.inc';
$link = new mysqli($host, $user, $passwd, $db, $port, $socket);
$link->query('DROP PROCEDURE IF EXISTS test_field_count_p');
?>
--EXPECT--
int(1)
int(2)
int(0)
1 change: 1 addition & 0 deletions ext/mysqlnd/mysqlnd_ps.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ mysqlnd_stmt_execute_parse_response(MYSQLND_STMT * const s, enum_mysqlnd_parse_e

stmt->state = MYSQLND_STMT_EXECUTED;
if (conn->last_query_type == QUERY_UPSERT || conn->last_query_type == QUERY_LOAD_LOCAL) {
stmt->field_count = conn->field_count;
DBG_INF("PASS");
DBG_RETURN(PASS);
}
Expand Down
39 changes: 39 additions & 0 deletions ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset_columncount.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
--TEST--
MySQL PDOStatement->columnCount() is 0 for the trailing OK packet of a stored procedure
--EXTENSIONS--
pdo_mysql
--SKIPIF--
<?php
require_once __DIR__ . '/inc/mysql_pdo_test.inc';
MySQLPDOTest::skip();
?>
--FILE--
<?php
require_once __DIR__ . '/inc/mysql_pdo_test.inc';
$db = MySQLPDOTest::factory();
$db->exec('DROP PROCEDURE IF EXISTS pdo_mysql_stmt_nextrowset_columncount_p');
$db->exec('CREATE PROCEDURE pdo_mysql_stmt_nextrowset_columncount_p() BEGIN SELECT 1 AS a; SELECT 2 AS b, 3 AS c; END');

foreach ([true, false] as $emulate) {
$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, $emulate);
$stmt = $db->prepare('CALL pdo_mysql_stmt_nextrowset_columncount_p()');
$stmt->execute();
do {
var_dump($stmt->columnCount());
$stmt->fetchAll();
} while ($stmt->nextRowset());
}
?>
--CLEAN--
<?php
require_once __DIR__ . '/inc/mysql_pdo_test.inc';
$db = MySQLPDOTest::factory();
$db->exec('DROP PROCEDURE IF EXISTS pdo_mysql_stmt_nextrowset_columncount_p');
?>
--EXPECT--
int(1)
int(2)
int(0)
int(1)
int(2)
int(0)
Loading