Fix header's size of structs defines in ispell.

diff --git a/contrib/tsearch2/ispell/spell.c b/contrib/tsearch2/ispell/spell.c
index c14012a6e7346f8e297f175fbfbd23f9d7145ca7..4d83532f5029c0c5a68a72faebe84c91a5f5c1e2 100644 (file)
--- 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 50a5947680e7cda064c08a659e7b5b23909c9179..2b79f455a3081b68f605b5797c7bd94631af7686 100644 (file)
--- 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
 {