mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix reference-after-free in the new btree page split code, as reported by

Browse Source 
the buildfarm via Stefan Kaltenbrunner.

Patch from Heikki Linnakangas.
This commit is contained in:
Alvaro Herrera 2007-02-08 13:52:55 +00:00
parent 086c189456
commit f8ebab901b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/access/nbtree/nbtinsert.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.150 2007/02/08 05:05:53 momjian Exp $ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.151 2007/02/08 13:52:55 alvherre Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -953,7 +953,7 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
xlrec.rightsib = BufferGetBlockNumber(rbuf); xlrec.rightsib = BufferGetBlockNumber(rbuf);
xlrec.firstright = firstright; xlrec.firstright = firstright;
xlrec.rnext = ropaque->btpo_next; xlrec.rnext = ropaque->btpo_next;
xlrec.level = lopaque->btpo.level; xlrec.level = ropaque->btpo.level;
rdata[0].data = (char *) &xlrec; rdata[0].data = (char *) &xlrec;
rdata[0].len = SizeOfBtreeSplit; rdata[0].len = SizeOfBtreeSplit;
@ -962,7 +962,7 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
lastrdata = &rdata[0]; lastrdata = &rdata[0];
/* Log downlink on non-leaf pages. */ /* Log downlink on non-leaf pages. */
if (lopaque->btpo.level > 0) if (ropaque->btpo.level > 0)
{ {
lastrdata->next = lastrdata + 1; lastrdata->next = lastrdata + 1;
lastrdata++; lastrdata++;
@ -1040,8 +1040,8 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
recptr = XLogInsert(RM_BTREE_ID, xlinfo, rdata); recptr = XLogInsert(RM_BTREE_ID, xlinfo, rdata);
PageSetLSN(leftpage, recptr); PageSetLSN(origpage, recptr);
PageSetTLI(leftpage, ThisTimeLineID); PageSetTLI(origpage, ThisTimeLineID);
PageSetLSN(rightpage, recptr); PageSetLSN(rightpage, recptr);
PageSetTLI(rightpage, ThisTimeLineID); PageSetTLI(rightpage, ThisTimeLineID);
if (!P_RIGHTMOST(ropaque)) if (!P_RIGHTMOST(ropaque))