aboutsummaryrefslogtreecommitdiff
path: root/contrib/pageinspect/sql/gist.sql
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2023-03-02 14:03:21 +0900
committerMichael Paquier <michael@paquier.xyz>2023-03-02 14:03:21 +0900
commit5ad63eee13e70eeff9659bcee024e8249b6bf68c (patch)
treed034ef97e7e2cc1882280db5ba36b8349994f056 /contrib/pageinspect/sql/gist.sql
parent1a9356f657e19ae1abeb0ffea0b7edaf69e315cb (diff)
downloadpostgresql-5ad63eee13e70eeff9659bcee024e8249b6bf68c.tar.gz
postgresql-5ad63eee13e70eeff9659bcee024e8249b6bf68c.zip
pageinspect: Fix crash with gist_page_items()
Attempting to use this function with a raw page not coming from a GiST index would cause a crash, as it was missing the same sanity checks as gist_page_items_bytea(). This slightly refactors the code so as all the basic validation checks for GiST pages are done in a single routine, in the same fashion as the pageinspect functions for hash and BRIN. This fixes an issue similar to 076f4d9. A test is added to stress for this case. While on it, I have added a similar test for brin_page_items() with a combination make of a valid GiST index and a raw btree page. This one was already protected, but it was not tested. Reported-by: Egor Chindyaskin Author: Dmitry Koval Discussion: https://postgr.es/m/17815-fc4a2d3b74705703@postgresql.org Backpatch-through: 14
Diffstat (limited to 'contrib/pageinspect/sql/gist.sql')
-rw-r--r--contrib/pageinspect/sql/gist.sql10
1 files changed, 6 insertions, 4 deletions
diff --git a/contrib/pageinspect/sql/gist.sql b/contrib/pageinspect/sql/gist.sql
index ee46e09053e..963d5d40a3c 100644
--- a/contrib/pageinspect/sql/gist.sql
+++ b/contrib/pageinspect/sql/gist.sql
@@ -26,14 +26,16 @@ SELECT * FROM gist_page_items(get_raw_page('test_gist_idx', 1), 'test_gist_idx')
-- platform-dependent (endianess), so omit the actual key data from the output.
SELECT itemoffset, ctid, itemlen FROM gist_page_items_bytea(get_raw_page('test_gist_idx', 0));
--- Failure with non-GiST index.
+-- Suppress the DETAIL message, to allow the tests to work across various
+-- page sizes and architectures.
+\set VERBOSITY terse
+
+-- Failures with non-GiST index.
CREATE INDEX test_gist_btree on test_gist(t);
SELECT gist_page_items(get_raw_page('test_gist_btree', 0), 'test_gist_btree');
+SELECT gist_page_items(get_raw_page('test_gist_btree', 0), 'test_gist_idx');
-- Failure with various modes.
--- Suppress the DETAIL message, to allow the tests to work across various
--- page sizes and architectures.
-\set VERBOSITY terse
-- invalid page size
SELECT gist_page_items_bytea('aaa'::bytea);
SELECT gist_page_items('aaa'::bytea, 'test_gist_idx'::regclass);