pg_stat_statements: Fix buffer overflow with query normalization
Since commit 62d712ecfd94, pg_stat_statements has been underestimating
the size of the result buffer possible for a normalized query, in cases
where the query includes many squashable lists, causing the normalized
query to write past the allocated area.
The allocated buffer size forgot to account for the comment appended in
a squashable list, "/*, ... */". Instead of trying to track down
precisely how much space we need, fix by switch to using an expansible
StringInfo. This not only fixes the bug, but it also makes the code
simpler to follow.
Author: Álvaro Herrera
Reported-by: Sajeeb Lohani with TrendAI Zero Day Initiative
Reported-by: Yuelin Wang <3020001251@tju.edu.cn>
Diagnosed-by: Michaël Paquier
Backpatch-through: 18
Security: CVE-2026-14676
Discussion: https://postgr.es/m/19528-7290dd7e6f7dcc22@postgresql.org
Branch
------
REL_19_STABLE
Details
-------
https://git.postgresql.org/pg/commitdiff/bb02eba534112594bc44a4b4c4fe9acb7ac7d656
Author: Álvaro Herrera
Modified Files
--------------
contrib/pg_stat_statements/pg_stat_statements.c | 44 +++++++++----------------
1 file changed, 16 insertions(+), 28 deletions(-)