| From: | Álvaro Herrera <alvherre(at)kurilemu(dot)de> |
|---|---|
| To: | pgsql-committers(at)lists(dot)postgresql(dot)org |
| Subject: | pgsql: pg_stat_statements: Fix handling of duplicate constant locations |
| Date: | 2025-10-29 11:35:48 |
| Message-ID: | E1vE4Sy-0044UY-3B@gemulon.postgresql.org |
| Views: | Whole Thread | Raw Message | Download mbox | Resend email |
| Thread: | |
| Lists: | pgsql-committers |
pg_stat_statements: Fix handling of duplicate constant locations
Two or more constants can have the same location. We handled this
correctly for non squashed constants, but failed to do it if squashed
(resulting in out-of-bounds memory access), because the code structure
became broken by commit 0f65f3eec478: we failed to update 'last_loc'
correctly when skipping these squashed constants.
The simplest fix seems to be to get rid of 'last_loc' altogether -- in
hindsight, it's quite pointless. Also, when ignoring a constant because
of this, make sure to fulfill fill_in_constant_lengths's duty of setting
its length to -1.
Lastly, we can use == instead of <= because the locations have been
sorted beforehand, so the < case cannot arise.
Co-authored-by: Sami Imseih <samimseih(at)gmail(dot)com>
Co-authored-by: Dmitry Dolgov <9erthalion6(at)gmail(dot)com>
Reported-by: Konstantin Knizhnik <knizhnik(at)garret(dot)ru>
Backpatch-through: 18
Discussion: https://www.postgresql.org/message-id/2b91e358-0d99-43f7-be44-d2d4dbce37b3%40garret.ru
Branch
------
master
Details
-------
https://git.postgresql.org/pg/commitdiff/16edc1b94fc2db6e6a376471e280b50a418907c2
Modified Files
--------------
contrib/pg_stat_statements/expected/squashing.out | 80 +++++++++++++++++++++++
contrib/pg_stat_statements/pg_stat_statements.c | 33 +++++-----
contrib/pg_stat_statements/sql/squashing.sql | 26 ++++++++
3 files changed, 123 insertions(+), 16 deletions(-)
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Álvaro Herrera | 2025-10-29 11:35:49 | pgsql: pg_stat_statements: Fix handling of duplicate constant locations |
| Previous Message | Álvaro Herrera | 2025-10-29 10:49:26 | pgsql: CheckNNConstraintFetch: Fill all of ConstrCheck in a single pass |