Fix synonym-dict breakage introduced in last patch :-(.

Minor other cleanups.

diff --git a/src/backend/tsearch/dict_synonym.c b/src/backend/tsearch/dict_synonym.c
index 46f6edae2dc4e826d3488a1cdce6c5a0e3b07aab..e07d74407b368171c3a031c068b6901c7f26594c 100644 (file)
--- a/src/backend/tsearch/dict_synonym.c
+++ b/src/backend/tsearch/dict_synonym.c
@@ -120,30 +120,31 @@ dsynonym_init(PG_FUNCTION_ARGS)
                        /* Empty line */
                        goto skipline;
                }
-               *end = '\0';
-               if (end >= line + strlen(line))
+               if (*end == '\0')
                {
                        /* A line with only one word. Ignore silently. */
                        goto skipline;
                }
+               *end = '\0';
 
                starto = findwrd(end + 1, &end);
                if (!starto)
                {
-                       /* A line with only one word. Ignore silently. */
+                       /* A line with only one word (+whitespace). Ignore silently. */
                        goto skipline;
                }
                *end = '\0';
 
-               /* starti now points to the first word, and starto to the second
+               /*
+                * starti now points to the first word, and starto to the second
                 * word on the line, with a \0 terminator at the end of both words.
                 */
 
-               if (cur == d->len)
+               if (cur >= d->len)
                {
                        if (d->len == 0)
                        {
-                               d->len = 16;
+                               d->len = 64;
                                d->syn = (Syn *) palloc(sizeof(Syn) * d->len);
                        }
                        else
@@ -180,7 +181,8 @@ dsynonym_lexize(PG_FUNCTION_ARGS)
                           *found;
        TSLexeme   *res;
 
-       if (len <= 0)
+       /* note: d->len test protects against Solaris bsearch-of-no-items bug */
+       if (len <= 0 || d->len <= 0)
                PG_RETURN_POINTER(NULL);
 
        key.in = lowerstr_with_len(in, len);