Commit2848c30

committed

Fix unligned access in parse commit record

1 parentcacdcc5 commit2848c30Copy full SHA for 2848c30

File tree

-11

lines changed

-11

lines changed

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,8 @@ ParseCommitRecord(uint8 info, xl_xact_commit xlrec, xl_xact_parsed_commit pars`
`79`	`79`	`uint8gidlen=xl_twophase->gidlen;`
`80`	`80`
`81`	`81`	`parsed->twophase_xid=xl_twophase->xid;`
`82`		`-data+=MAXALIGN(MinSizeOfXactTwophase);`
`83`		`-`
`84`		`-strcpy(parsed->twophase_gid,data);`
`85`		`-data+=MAXALIGN(gidlen);`
	`82`	`+strcpy(parsed->twophase_gid,xl_twophase->gid);`
	`83`	`+data+=INTALIGN(MinSizeOfXactTwophase+gidlen);`
`86`	`84`	`}`
`87`	`85`
`88`	`86`	`if (parsed->xinfo&XACT_XINFO_HAS_RELFILENODES)`
`@@ -169,10 +167,8 @@ ParseAbortRecord(uint8 info, xl_xact_abort xlrec, xl_xact_parsed_abort parsed)`
`169`	`167`	`uint8gidlen=xl_twophase->gidlen;`
`170`	`168`
`171`	`169`	`parsed->twophase_xid=xl_twophase->xid;`
`172`		`-data+=MAXALIGN(MinSizeOfXactTwophase);`
`173`		`-`
`174`		`-strcpy(parsed->twophase_gid,data);`
`175`		`-data+=MAXALIGN(gidlen);`
	`170`	`+strcpy(parsed->twophase_gid,xl_twophase->gid);`
	`171`	`+data+=INTALIGN(MinSizeOfXactTwophase+gidlen);`
`176`	`172`	`}`
`177`	`173`
`178`	`174`	`if (parsed->xinfo&XACT_XINFO_HAS_ORIGIN)`

Lines changed: 2 additions & 2 deletions

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)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ typedef struct xl_xact_twophase`
`233`	`233`	`* Gid and gidlen will be set only with wal_level=logical.`
`234`	`234`	`* See details in XactLogCommitRecord().`
`235`	`235`	`*/`
`236`		`-uint8gidlen;`
	`236`	`+intgidlen;`
`237`	`237`	`chargid[GIDSIZE];`
`238`	`238`	`}xl_xact_twophase;`
`239`	`239`	`#defineMinSizeOfXactTwophase offsetof(xl_xact_twophase, gid)`

Comments

(0)