From: Teodor Sigaev <teodor@sigaev.ru>
Date: Tue, 11 Sep 2007 13:04:53 +0000 (+0000)
Subject: Fix header's size of structs defines in ispell.
X-Git-Tag: REL8_2_5~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71760652731235918cf878be7d0b8e6bb8c6b1ec;p=thirdparty%2Fpostgresql.git

Fix header's size of structs defines in ispell.
---

diff --git a/contrib/tsearch2/ispell/spell.c b/contrib/tsearch2/ispell/spell.c
index c14012a6e73..4d83532f502 100644
--- a/contrib/tsearch2/ispell/spell.c
+++ b/contrib/tsearch2/ispell/spell.c
@@ -671,9 +671,9 @@ mkSPNode(IspellDict * Conf, int low, int high, int level)
 	if (!nchar)
 		return NULL;
 
-	rs = (SPNode *) malloc(SPNHRDSZ + nchar * sizeof(SPNodeData));
+	rs = (SPNode *) malloc(SPNHDRSZ + nchar * sizeof(SPNodeData));
 	MEMOUT(rs);
-	memset(rs, 0, SPNHRDSZ + nchar * sizeof(SPNodeData));
+	memset(rs, 0, SPNHDRSZ + nchar * sizeof(SPNodeData));
 	rs->length = nchar;
 	data = rs->data;
 
diff --git a/contrib/tsearch2/ispell/spell.h b/contrib/tsearch2/ispell/spell.h
index 50a5947680e..2b79f455a30 100644
--- a/contrib/tsearch2/ispell/spell.h
+++ b/contrib/tsearch2/ispell/spell.h
@@ -29,7 +29,7 @@ typedef struct SPNode
 	SPNodeData	data[1];
 }	SPNode;
 
-#define SPNHRDSZ	(sizeof(uint32))
+#define SPNHDRSZ	(offsetof(SPNode,data))
 
 
 typedef struct spell_struct
@@ -93,7 +93,7 @@ typedef struct AffixNode
 	AffixNodeData data[1];
 }	AffixNode;
 
-#define ANHRDSZ		   (sizeof(uint32))
+#define ANHRDSZ		   (offsetof(AffixNode, data))
 
 typedef struct
 {