Skip to content

ext/mysqlnd: Fix close_on_server #21765

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
kamil-tekiela wants to merge 2 commits into
base: master
Choose a base branch
from
+3 −3
Open

ext/mysqlnd: Fix close_on_server #21765

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2df652
Fix close_on_server
kamil-tekiela Apr 15, 2026
744ec05
Fix DBG_RETURN
kamil-tekiela Apr 15, 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
6 changes: 3 additions & 3 deletions ext/mysqlnd/mysqlnd_ps.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1752,6 +1752,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, close_on_server)(MYSQLND_STMT * const s, bo
MYSQLND_STMT_DATA * stmt = s? s->data : NULL;
MYSQLND_CONN_DATA * conn = stmt? stmt->conn : NULL;
enum_mysqlnd_collected_stats statistic = STAT_LAST;
enum_func_status ret = PASS;

DBG_ENTER("mysqlnd_stmt::close_on_server");
if (!stmt || !conn) {
Expand Down Expand Up @@ -1789,13 +1790,12 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, close_on_server)(MYSQLND_STMT * const s, bo
STAT_FREE_RESULT_EXPLICIT);

if (GET_CONNECTION_STATE(&conn->state) == CONN_READY) {
enum_func_status ret = FAIL;
const size_t stmt_id = stmt->stmt_id;

ret = conn->command->stmt_close(conn, stmt_id);
if (ret == FAIL) {
COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info);
DBG_RETURN(FAIL);
/* Don't return early - continue with cleanup to prevent memory leaks */
Copy link
Copy Markdown
Member

@SakiTakamachi SakiTakamachi Apr 15, 2026

Choose a reason for hiding this comment

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

If we do not return early here, won’t this end up returning PASS?

It introduces a bit of code duplication, but how about adding the cleanup logic here?

Copy link
Copy Markdown
Member Author

@kamil-tekiela kamil-tekiela Apr 15, 2026

Choose a reason for hiding this comment

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

Is this better now?

}
}
}
Expand Down Expand Up @@ -1825,7 +1825,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, close_on_server)(MYSQLND_STMT * const s, bo
stmt->conn = NULL;
}

DBG_RETURN(PASS);
DBG_RETURN(ret);
}
/* }}} */

Expand Down
Loading