Commit15fe6af

committed

fix len calculation in 2pc file header

1 parent567f98f commit15fe6afCopy full SHA for 15fe6af

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1218,7 +1218,6 @@ ReadTwoPhaseFile(TransactionId xid, bool give_warnings)`
`1218`	`1218`	`if (crc_offset!=MAXALIGN(crc_offset))`
`1219`	`1219`	`{`
`1220`	`1220`	`CloseTransientFile(fd);`
`1221`		`-fprintf(stderr,"wrong crc offset in two-phase file \"%s\"\n",path);`
`1222`	`1221`	`returnNULL;`
`1223`	`1222`	`}`
`1224`	`1223`
`@@ -1245,7 +1244,6 @@ ReadTwoPhaseFile(TransactionId xid, bool give_warnings)`
`1245`	`1244`	`if (hdr->magic!=TWOPHASE_MAGIC\|\|hdr->total_len!=stat.st_size)`
`1246`	`1245`	`{`
`1247`	`1246`	`pfree(buf);`
`1248`		`-fprintf(stderr,"muggle two-phase file \"%s\": no magic\n",path);`
`1249`	`1247`	`returnNULL;`
`1250`	`1248`	`}`
`1251`	`1249`
`@@ -1622,6 +1620,10 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len)`
`1622`	`1620`	`pg_crc32cstatefile_crc;`
`1623`	`1621`	`intfd;`
`1624`	`1622`
	`1623`	`+/* Crutch to fix crc and len check on 2pc file reading */`
	`1624`	`+Assert( ((TwoPhaseFileHeader*)content)->total_len-sizeof(pg_crc32c) <=len);`
	`1625`	`+len= ((TwoPhaseFileHeader*)content)->total_len-sizeof(pg_crc32c);`
	`1626`	`+`
`1625`	`1627`	`/* Recompute CRC */`
`1626`	`1628`	`INIT_CRC32C(statefile_crc);`
`1627`	`1629`	`COMP_CRC32C(statefile_crc,content,len);`

Comments

(0)