Fix another place that was assuming that a local variable declared as

tglsfdc · tglsfdc · commit d50e256b6747 · 2008-03-01T19:26:22.000Z
"struct varlena" would be at least word-aligned.  Per buildfarm results
from gypsy_moth.  I did a little bit of trawling for other instances of
this coding pattern, and didn't find any; but if we turn up any more
of them I think we'd better revert the "char [4]" patch and find another
way of making tuptoaster.c alignment-safe.
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
@@ -24,7 +24,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/large_object/inv_api.c,v 1.127 2008/01/01 19:45:52 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/large_object/inv_api.c,v 1.128 2008/03/01 19:26:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -516,7 +516,8 @@ inv_write(LargeObjectDesc *obj_desc, const char *buf, int nbytes)
 	struct
 	{
 		bytea		hdr;
-		char		data[LOBLKSIZE];
+		char		data[LOBLKSIZE];	/* make struct big enough */
+		int32		align_it;	/* ensure struct is aligned well enough */
 	}			workbuf;
 	char	   *workb = VARDATA(&workbuf.hdr);
 	HeapTuple	newtup;
@@ -707,7 +708,8 @@ inv_truncate(LargeObjectDesc *obj_desc, int len)
 	struct
 	{
 		bytea		hdr;
-		char		data[LOBLKSIZE];
+		char		data[LOBLKSIZE];	/* make struct big enough */
+		int32		align_it;	/* ensure struct is aligned well enough */
 	}			workbuf;
 	char	   *workb = VARDATA(&workbuf.hdr);
 	HeapTuple	newtup;

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*`
`25`	`25`	`*`
`26`	`26`	`* IDENTIFICATION`
`27`		`- * $PostgreSQL: pgsql/src/backend/storage/large_object/inv_api.c,v 1.127 2008/01/01 19:45:52 momjian Exp $`
	`27`	`+ * $PostgreSQL: pgsql/src/backend/storage/large_object/inv_api.c,v 1.128 2008/03/01 19:26:22 tgl Exp $`
`28`	`28`	`*`
`29`	`29`	`*-------------------------------------------------------------------------`
`30`	`30`	`*/`
`@@ -516,7 +516,8 @@ inv_write(LargeObjectDesc obj_desc, const char buf, int nbytes)`
`516`	`516`	`struct`
`517`	`517`	`{`
`518`	`518`	`bytea hdr;`
`519`		`- char data[LOBLKSIZE];`
	`519`	`+ char data[LOBLKSIZE]; /* make struct big enough */`
	`520`	`+ int32 align_it; /* ensure struct is aligned well enough */`
`520`	`521`	`} workbuf;`
`521`	`522`	`char *workb = VARDATA(&workbuf.hdr);`
`522`	`523`	`HeapTuple newtup;`
`@@ -707,7 +708,8 @@ inv_truncate(LargeObjectDesc *obj_desc, int len)`
`707`	`708`	`struct`
`708`	`709`	`{`
`709`	`710`	`bytea hdr;`
`710`		`- char data[LOBLKSIZE];`
	`711`	`+ char data[LOBLKSIZE]; /* make struct big enough */`
	`712`	`+ int32 align_it; /* ensure struct is aligned well enough */`
`711`	`713`	`} workbuf;`
`712`	`714`	`char *workb = VARDATA(&workbuf.hdr);`
`713`	`715`	`HeapTuple newtup;`