Fix header's size of structs defines in ispell.

Backpatch is needed for contrib version.

diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c
index 6db7a0d57458a3ddfa8f5354ae67ff90d1a8ef02..16ee57d9ec4bf9577b20cc56004eb3124123e96d 100644 (file)
--- a/src/backend/tsearch/spell.c
+++ b/src/backend/tsearch/spell.c
@@ -896,7 +896,7 @@ mkSPNode(IspellDict * Conf, int low, int high, int level)
        if (!nchar)
                return NULL;
 
-       rs = (SPNode *) palloc0(SPNHRDSZ + nchar * sizeof(SPNodeData));
+       rs = (SPNode *) palloc0(SPNHDRSZ + nchar * sizeof(SPNodeData));
        rs->length = nchar;
        data = rs->data;
 

diff --git a/src/include/tsearch/dicts/spell.h b/src/include/tsearch/dicts/spell.h
index ef15dd04667ae693161263bfa90ae70a34a57e1e..3c4a779910055def3827f34de24c06c6c2a7fffb 100644 (file)
--- a/src/include/tsearch/dicts/spell.h
+++ b/src/include/tsearch/dicts/spell.h
@@ -52,7 +52,7 @@ typedef struct SPNode
        SPNodeData      data[1];
 } SPNode;
 
-#define SPNHRDSZ       (sizeof(uint32))
+#define SPNHDRSZ       (offsetof(SPNode,data))
 
 
 typedef struct spell_struct
@@ -123,7 +123,7 @@ typedef struct AffixNode
        AffixNodeData data[1];
 } AffixNode;
 
-#define ANHRDSZ                   (sizeof(uint32))
+#define ANHRDSZ                   (offsetof(AffixNode, data))
 
 typedef struct
 {