Skip to content

Commit aa00e61

Browse files
tglsfdctglsfdc
committed
Add more sanity-checking to PageAddItem and PageIndexTupleDelete,
to prevent spreading of corruption when page header pointers are bad. Merge PageZero into PageInit, since it was never used separately, and remove separate memset calls used at most other PageInit call points. Remove IndexPageCleanup, which wasn't used at all.
1 parent 685a66c commit aa00e61

File tree

7 files changed

+94
-144
lines changed

7 files changed

+94
-144
lines changed

‎src/backend/access/gist/gist.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.86 2001/11/05 17:46:23 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.87 2002/01/15 22:14:16 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1437,7 +1437,7 @@ GISTInitBuffer(Buffer b, uint32 f)
14371437
pageSize = BufferGetPageSize(b);
14381438

14391439
page = BufferGetPage(b);
1440-
MemSet(page, 0, (int) pageSize);
1440+
14411441
PageInit(page, pageSize, sizeof(GISTPageOpaqueData));
14421442

14431443
opaque = (GISTPageOpaque) PageGetSpecialPointer(page);

‎src/backend/access/hash/hashpage.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.33 2001/10/25 05:49:21 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.34 2002/01/15 22:14:16 tgl Exp $
1212
*
1313
* NOTES
1414
* Postgres hash pages look like ordinary relation pages. The opaque
@@ -301,17 +301,7 @@ _hash_chgbufaccess(Relation rel,
301301
void
302302
_hash_pageinit(Page page, Size size)
303303
{
304-
Assert(((PageHeader) page)->pd_lower == 0);
305-
Assert(((PageHeader) page)->pd_upper == 0);
306-
Assert(((PageHeader) page)->pd_special == 0);
307-
308-
/*
309-
* Cargo-cult programming -- don't really need this to be zero, but
310-
* creating new pages is an infrequent occurrence and it makes me feel
311-
* good when I know they're empty.
312-
*/
313-
MemSet(page, 0, size);
314-
304+
Assert(PageIsNew(page));
315305
PageInit(page, size, sizeof(HashPageOpaqueData));
316306
}
317307

‎src/backend/access/heap/heapam.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.128 2001/11/05 17:46:23 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.129 2002/01/15 22:14:17 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -2094,10 +2094,7 @@ heap_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record)
20942094
uint32 newlen;
20952095

20962096
if (record->xl_info & XLOG_HEAP_INIT_PAGE)
2097-
{
20982097
PageInit(page, BufferGetPageSize(buffer), 0);
2099-
PageZero(page);
2100-
}
21012098

21022099
if (XLByteLE(lsn, PageGetLSN(page))) /* changes are applied */
21032100
{
@@ -2262,10 +2259,7 @@ newsame:;
22622259
uint32 newlen;
22632260

22642261
if (record->xl_info & XLOG_HEAP_INIT_PAGE)
2265-
{
22662262
PageInit(page, BufferGetPageSize(buffer), 0);
2267-
PageZero(page);
2268-
}
22692263

22702264
if (XLByteLE(lsn, PageGetLSN(page))) /* changes are applied */
22712265
{

‎src/backend/access/nbtree/nbtpage.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.54 2001/10/25 05:49:21 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.55 2002/01/15 22:14:17 tgl Exp $
1313
*
1414
* NOTES
1515
* Postgres btree pages look like ordinary relation pages. The opaque
@@ -399,14 +399,6 @@ _bt_wrtnorelbuf(Relation rel, Buffer buf)
399399
void
400400
_bt_pageinit(Page page, Size size)
401401
{
402-
/*
403-
* Cargo_cult programming -- don't really need this to be zero, but
404-
* creating new pages is an infrequent occurrence and it makes me feel
405-
* good when I know they're empty.
406-
*/
407-
408-
MemSet(page, 0, size);
409-
410402
PageInit(page, size, sizeof(BTPageOpaqueData));
411403
((BTPageOpaque) PageGetSpecialPointer(page))->btpo_parent =
412404
InvalidBlockNumber;

‎src/backend/access/rtree/rtree.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.68 2001/11/05 17:46:24 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.69 2002/01/15 22:14:17 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1107,7 +1107,7 @@ RTInitBuffer(Buffer b, uint32 f)
11071107
pageSize = BufferGetPageSize(b);
11081108

11091109
page = BufferGetPage(b);
1110-
MemSet(page, 0, (int) pageSize);
1110+
11111111
PageInit(page, pageSize, sizeof(RTreePageOpaqueData));
11121112

11131113
opaque = (RTreePageOpaque) PageGetSpecialPointer(page);

0 commit comments

Comments
 (0)