Fix masking of SP-GiST pages during xlog consistency check

akorotkov · akorotkov · commit 3f88e2d78dbe · 2020-06-20T17:35:59.000+03:00
spg_mask() didn't take into account that pd_lower equal to SizeOfPageHeaderData is still valid value. This commit fixes that. Backpatch to 11, where spg_mask() pg_lower check was introduced. Reported-by: Michael Paquier Discussion: https://postgr.es/m/20200615131405.GM52676%40paquier.xyz Backpatch-through: 11
diff --git a/src/backend/access/spgist/spgxlog.c b/src/backend/access/spgist/spgxlog.c
@@ -1043,6 +1043,6 @@ spg_mask(char *pagedata, BlockNumber blkno)
 	 * Mask the unused space, but only if the page's pd_lower appears to have
 	 * been set correctly.
 	 */
-	if (pagehdr->pd_lower > SizeOfPageHeaderData)
+	if (pagehdr->pd_lower >= SizeOfPageHeaderData)
 		mask_unused_space(page);
 }

Original file line number	Diff line number	Diff line change
`@@ -1043,6 +1043,6 @@ spg_mask(char *pagedata, BlockNumber blkno)`
`1043`	`1043`	`* Mask the unused space, but only if the page's pd_lower appears to have`
`1044`	`1044`	`* been set correctly.`
`1045`	`1045`	`*/`
`1046`		`- if (pagehdr->pd_lower > SizeOfPageHeaderData)`
	`1046`	`+ if (pagehdr->pd_lower >= SizeOfPageHeaderData)`
`1047`	`1047`	`mask_unused_space(page);`
`1048`	`1048`	`}`