8000 pg_stat_statements: fetch stmt location/length before it disappears. · postgres/postgres@149e001 · GitHub
[go: up one dir, main page]

Skip to content

Commit 149e001

Browse files
committed
pg_stat_statements: fetch stmt location/length before it disappears.
When executing a utility statement, we must fetch everything we need out of the PlannedStmt data structure before calling standard_ProcessUtility. In certain cases (possibly only ROLLBACK in extended query protocol), that data structure will get freed during command execution. The situation is probably often harmless in production builds, but in debug builds we intentionally overwrite the freed memory with garbage, leading to picking up garbage values of statement location and length, typically causing an assertion failure later in pg_stat_statements. In non-debug builds, if something did go wrong it would likely lead to storing garbage for the query string. Report and fix by zhaoqigui (with cosmetic adjustments by me). It's an old problem, so back-patch to all supported versions. Discussion: https://postgr.es/m/17663-a344fd0675f92128@postgresql.org Discussion: https://postgr.es/m/1667307420050.56657@hundsun.com
1 parent 341fba2 commit 149e001

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

contrib/pg_stat_statements/pg_stat_statements.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -965,6 +965,8 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
965965
DestReceiver *dest, char *completionTag)
966966
{
967967
Node *parsetree = pstmt->utilityStmt;
968+
int saved_stmt_location = pstmt->stmt_location;
969+
int saved_stmt_len = pstmt->stmt_len;
968970

969971
/*
970972
* If it's an EXECUTE statement, we don't track it and don't increment the
@@ -1014,6 +1016,13 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
10141016
}
10151017
PG_END_TRY();
10161018

1019+
/*
1020+
* CAUTION: do not access the *pstmt data structure again below here.
1021+
* If it was a ROLLBACK or similar, that data structure may have been
1022+
* freed. We must copy everything we still need into local variables,
1023+
* which we did above.
1024+
*/
1025+
10171026
INSTR_TIME_SET_CURRENT(duration);
10181027
INSTR_TIME_SUBTRACT(duration, start);
10191028

@@ -1052,8 +1061,8 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
10521061

10531062
pgss_store(queryString,
10541063
0, /* signal that it's a utility stmt */
1055-
pstmt->stmt_location,
1056-
pstmt->stmt_len,
1064+
saved_stmt_location,
1065+
saved_stmt_len,
10571066
INSTR_TIME_GET_MILLISEC(duration),
10581067
rows,
10591068
&bufusage,

0 commit comments

Comments
 (0)
0