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 <[email protected]> Reported-by: Sajeeb Lohani with TrendAI Zero Day Initiative Reported-by: Yuelin Wang <[email protected]> Diagnosed-by: Michaël Paquier <[email protected]> Backpatch-through: 18 Security: CVE-2026-14676 Discussion: https://postgr.es/m/[email protected] Branch ------ master Details ------- https://git.postgresql.org/pg/commitdiff/1e2795ddeafc66cd78d2c90a69dd820488639c7c Author: Álvaro Herrera <[email protected]> Modified Files -------------- contrib/pg_stat_statements/pg_stat_statements.c | 44 +++++++++---------------- 1 file changed, 16 insertions(+), 28 deletions(-)
