Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0f2f564

Browse files
committed
pg_stat_statements: fetch stmt location/length before it disappears.
When executing a utility statement, we must fetch everythingwe need out of the PlannedStmt data structure before callingstandard_ProcessUtility. In certain cases (possibly only ROLLBACKin extended query protocol), that data structure will get freedduring command execution. The situation is probably often harmlessin production builds, but in debug builds we intentionally overwritethe freed memory with garbage, leading to picking up garbage valuesof statement location and length, typically causing an assertionfailure later in pg_stat_statements. In non-debug builds, ifsomething did go wrong it would likely lead to storing garbagefor 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.orgDiscussion:https://postgr.es/m/1667307420050.56657@hundsun.com
1 parent5a30d43 commit0f2f564

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

‎contrib/pg_stat_statements/pg_stat_statements.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,6 +1077,8 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
10771077
{
10781078
Node*parsetree=pstmt->utilityStmt;
10791079
uint64saved_queryId=pstmt->queryId;
1080+
intsaved_stmt_location=pstmt->stmt_location;
1081+
intsaved_stmt_len=pstmt->stmt_len;
10801082

10811083
/*
10821084
* Force utility statements to get queryId zero. We do this even in cases
@@ -1142,6 +1144,16 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
11421144
}
11431145
PG_END_TRY();
11441146

1147+
/*
1148+
* CAUTION: do not access the *pstmt data structure again below here.
1149+
* If it was a ROLLBACK or similar, that data structure may have been
1150+
* freed. We must copy everything we still need into local variables,
1151+
* which we did above.
1152+
*
1153+
* For the same reason, we can't risk restoring pstmt->queryId to its
1154+
* former value, which'd otherwise be a good idea.
1155+
*/
1156+
11451157
INSTR_TIME_SET_CURRENT(duration);
11461158
INSTR_TIME_SUBTRACT(duration,start);
11471159

@@ -1166,8 +1178,8 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
11661178

11671179
pgss_store(queryString,
11681180
saved_queryId,
1169-
pstmt->stmt_location,
1170-
pstmt->stmt_len,
1181+
saved_stmt_location,
1182+
saved_stmt_len,
11711183
PGSS_EXEC,
11721184
INSTR_TIME_GET_MILLISEC(duration),
11731185
rows,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp