archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

PDO MySQL: Make sure nextRowset() works with partially consumed result

Browse source 
This was already working in all cases apart from native prepared
statements with unbuffered queries. In that case invoking
stmt_free_result() addresses the issue.
This commit is contained in:
Nikita Popov 2020-12-09 14:46:49 +01:00
parent 23193e89e4
commit 186b766368
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ext/pdo_mysql/mysql_statement.c
View file

@ -349,6 +349,15 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt) /* {{{ */
PDO_DBG_ENTER("pdo_mysql_stmt_next_rowset");
PDO_DBG_INF_FMT("stmt=%p", S->stmt);
/* ensure that we free any previous unfetched results */
if (S->stmt) {
mysql_stmt_free_result(S->stmt);
}
if (S->result) {
mysql_free_result(S->result);
S->result = NULL;
}
#ifdef PDO_USE_MYSQLND
if (!H->emulate_prepare) {
if (!mysqlnd_stmt_more_results(S->stmt)) {
@ -359,11 +368,6 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt) /* {{{ */
PDO_DBG_RETURN(0);
}
/* TODO - this code is stolen from execute() - see above */
if (S->result) {
mysql_free_result(S->result);
S->result = NULL;
}
{
/* for SHOW/DESCRIBE and others the column/field count is not available before execute */
int i;
@ -394,17 +398,6 @@ static int pdo_mysql_stmt_next_rowset(pdo_stmt_t *stmt) /* {{{ */
}
#endif
/* ensure that we free any previous unfetched results */
#ifndef PDO_USE_MYSQLND
if (S->stmt) {
mysql_stmt_free_result(S->stmt);
}
#endif
if (S->result) {
mysql_free_result(S->result);
S->result = NULL;
}
if (!mysql_more_results(H->server)) {
/* No more results */
PDO_DBG_RETURN(0);