Fix unligned access in parse commit record

knizhnik · knizhnik · commit 2848c300fd1b · 2017-02-06T19:01:41.000+03:00
diff --git a/src/backend/access/rmgrdesc/xactdesc.c b/src/backend/access/rmgrdesc/xactdesc.c
@@ -79,10 +79,8 @@ ParseCommitRecord(uint8 info, xl_xact_commit *xlrec, xl_xact_parsed_commit *pars
 		uint8 gidlen = xl_twophase->gidlen;
 
 		parsed->twophase_xid = xl_twophase->xid;
-		data += MAXALIGN(MinSizeOfXactTwophase);
-
-		strcpy(parsed->twophase_gid, data);
-		data += MAXALIGN(gidlen);
+		strcpy(parsed->twophase_gid, xl_twophase->gid);
+		data += INTALIGN(MinSizeOfXactTwophase + gidlen);
 	}
 
 	if (parsed->xinfo & XACT_XINFO_HAS_RELFILENODES)
@@ -169,10 +167,8 @@ ParseAbortRecord(uint8 info, xl_xact_abort *xlrec, xl_xact_parsed_abort *parsed)
 		uint8 gidlen = xl_twophase->gidlen;
 
 		parsed->twophase_xid = xl_twophase->xid;
-		data += MAXALIGN(MinSizeOfXactTwophase);
-
-		strcpy(parsed->twophase_gid, data);
-		data += MAXALIGN(gidlen);
+		strcpy(parsed->twophase_gid, xl_twophase->gid);
+		data += INTALIGN(MinSizeOfXactTwophase + gidlen);
 	}
 
 	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -5515,7 +5515,7 @@ XactLogCommitRecord(TimestampTz commit_time,
 	if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)
 	{
 		XLogRegisterData((char *) (&xl_twophase), MinSizeOfXactTwophase);
-		XLogRegisterData((char *) twophase_gid, xl_twophase.gidlen);
+		XLogRegisterData((char *) twophase_gid, INTALIGN(xl_twophase.gidlen));
 	}
 
 	if (xl_xinfo.xinfo & XACT_XINFO_HAS_RELFILENODES)
@@ -5639,7 +5639,7 @@ XactLogAbortRecord(TimestampTz abort_time,
 	if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)
 	{
 		XLogRegisterData((char *) (&xl_twophase), MinSizeOfXactTwophase);
-		XLogRegisterData((char *) twophase_gid, xl_twophase.gidlen);
+		XLogRegisterData((char *) twophase_gid, INTALIGN(xl_twophase.gidlen));
 	}
 
 	if (xl_xinfo.xinfo & XACT_XINFO_HAS_ORIGIN)
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
@@ -233,7 +233,7 @@ typedef struct xl_xact_twophase
 	 * Gid and gidlen will be set only with wal_level=logical.
 	 * See details in XactLogCommitRecord().
 	 */
-	uint8 gidlen;
+	int  gidlen;
 	char gid[GIDSIZE];
 } xl_xact_twophase;
 #define MinSizeOfXactTwophase offsetof(xl_xact_twophase, gid)

Original file line number	Diff line number	Diff line change
`@@ -5515,7 +5515,7 @@ XactLogCommitRecord(TimestampTz commit_time,`
`5515`	`5515`	`if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)`
`5516`	`5516`	`{`
`5517`	`5517`	`XLogRegisterData((char *) (&xl_twophase), MinSizeOfXactTwophase);`
`5518`		`- XLogRegisterData((char *) twophase_gid, xl_twophase.gidlen);`
	`5518`	`+ XLogRegisterData((char *) twophase_gid, INTALIGN(xl_twophase.gidlen));`
`5519`	`5519`	`}`
`5520`	`5520`
`5521`	`5521`	`if (xl_xinfo.xinfo & XACT_XINFO_HAS_RELFILENODES)`
`@@ -5639,7 +5639,7 @@ XactLogAbortRecord(TimestampTz abort_time,`
`5639`	`5639`	`if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)`
`5640`	`5640`	`{`
`5641`	`5641`	`XLogRegisterData((char *) (&xl_twophase), MinSizeOfXactTwophase);`
`5642`		`- XLogRegisterData((char *) twophase_gid, xl_twophase.gidlen);`
	`5642`	`+ XLogRegisterData((char *) twophase_gid, INTALIGN(xl_twophase.gidlen));`
`5643`	`5643`	`}`
`5644`	`5644`
`5645`	`5645`	`if (xl_xinfo.xinfo & XACT_XINFO_HAS_ORIGIN)`