diff options
| author | Robert Haas <rhaas@postgresql.org> | 2016-12-22 13:54:40 -0500 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2016-12-22 13:59:01 -0500 |
| commit | 097e41439d69e11fb870e009b1ac64dda4f01c3d (patch) | |
| tree | dbad47478d2aaae82d98b9c9275048a20efd90d9 /src | |
| parent | 2f802d95b4904dbed3dfdca1b3a607cd085d2e20 (diff) | |
| download | postgresql-097e41439d69e11fb870e009b1ac64dda4f01c3d.tar.gz postgresql-097e41439d69e11fb870e009b1ac64dda4f01c3d.zip | |
Fix broken error check in _hash_doinsert.
You can't just cast a HashMetaPage to a Page, because the meta page
data is stored after the page header, not at offset 0. Fortunately,
this didn't break anything because it happens to find hashm_bsize
at the offset at which it expects to find pd_pagesize_version, and
the values are close enough to the same that this works out.
Still, it's a bug, so back-patch to all supported versions.
Mithun Cy, revised a bit by me.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/hash/hashinsert.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c index 59c4213f9c8..4b022b5755a 100644 --- a/src/backend/access/hash/hashinsert.c +++ b/src/backend/access/hash/hashinsert.c @@ -35,6 +35,7 @@ _hash_doinsert(Relation rel, IndexTuple itup) BlockNumber blkno; BlockNumber oldblkno; bool retry; + Page metapage; Page page; HashPageOpaque pageopaque; Size itemsz; @@ -58,7 +59,8 @@ _hash_doinsert(Relation rel, IndexTuple itup) restart_insert: /* Read the metapage */ metabuf = _hash_getbuf(rel, HASH_METAPAGE, HASH_READ, LH_META_PAGE); - metap = HashPageGetMeta(BufferGetPage(metabuf)); + metapage = BufferGetPage(metabuf); + metap = HashPageGetMeta(metapage); /* * Check whether the item can fit on a hash page at all. (Eventually, we @@ -67,11 +69,11 @@ restart_insert: * * XXX this is useless code if we are only storing hash keys. */ - if (itemsz > HashMaxItemSize((Page) metap)) + if (itemsz > HashMaxItemSize(metapage)) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), errmsg("index row size %zu exceeds hash maximum %zu", - itemsz, HashMaxItemSize((Page) metap)), + itemsz, HashMaxItemSize(metapage)), errhint("Values larger than a buffer page cannot be indexed."))); oldblkno = InvalidBlockNumber; |