fix len calculation in 2pc file header

kelvich · kelvich · commit 15fe6af65406 · 2016-07-27T16:20:20.000+03:00
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -1218,7 +1218,6 @@ ReadTwoPhaseFile(TransactionId xid, bool give_warnings)
 	if (crc_offset != MAXALIGN(crc_offset))
 	{
 		CloseTransientFile(fd);
-		fprintf(stderr, "wrong crc offset in two-phase file \"%s\"\n", path);
 		return NULL;
 	}
 
@@ -1245,7 +1244,6 @@ ReadTwoPhaseFile(TransactionId xid, bool give_warnings)
 	if (hdr->magic != TWOPHASE_MAGIC || hdr->total_len != stat.st_size)
 	{
 		pfree(buf);
-		fprintf(stderr, "muggle two-phase file \"%s\": no magic\n", path);
 		return NULL;
 	}
 
@@ -1622,6 +1620,10 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len)
 	pg_crc32c	statefile_crc;
 	int			fd;
 
+	/* Crutch to fix crc and len check on 2pc file reading */
+	Assert( ((TwoPhaseFileHeader *) content)->total_len - sizeof(pg_crc32c) <= len);
+	len = ((TwoPhaseFileHeader *) content)->total_len - sizeof(pg_crc32c);
+
 	/* Recompute CRC */
 	INIT_CRC32C(statefile_crc);
 	COMP_CRC32C(statefile_crc, content, len);

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`	`return NULL;`
`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`	`return NULL;`
`1250`	`1248`	`}`
`1251`	`1249`
`@@ -1622,6 +1620,10 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len)`
`1622`	`1620`	`pg_crc32c statefile_crc;`
`1623`	`1621`	`int fd;`
`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);`