mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Minor other cleanups.
This commit is contained in:
Tom Lane 2007-08-25 02:29:45 +00:00
parent 93eab9312f
commit a13cefafb1
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/tsearch/dict_synonym.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tsearch/dict_synonym.c,v 1.3 2007/08/25 00:03:59 tgl Exp $ * $PostgreSQL: pgsql/src/backend/tsearch/dict_synonym.c,v 1.4 2007/08/25 02:29:45 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -120,30 +120,31 @@ dsynonym_init(PG_FUNCTION_ARGS)
/* Empty line */ /* Empty line */
goto skipline; goto skipline;
} }
*end = '\0'; if (*end == '\0')
if (end >= line + strlen(line))
{ {
/* A line with only one word. Ignore silently. */ /* A line with only one word. Ignore silently. */
goto skipline; goto skipline;
} }
*end = '\0';
starto = findwrd(end + 1, &end); starto = findwrd(end + 1, &end);
if (!starto) if (!starto)
{ {
/* A line with only one word. Ignore silently. */ /* A line with only one word (+whitespace). Ignore silently. */
goto skipline; goto skipline;
} }
*end = '\0'; *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. * 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) if (d->len == 0)
{ {
d->len = 16; d->len = 64;
d->syn = (Syn *) palloc(sizeof(Syn) * d->len); d->syn = (Syn *) palloc(sizeof(Syn) * d->len);
} }
else else
@ -180,7 +181,8 @@ dsynonym_lexize(PG_FUNCTION_ARGS)
*found; *found;
TSLexeme *res; 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); PG_RETURN_POINTER(NULL);
key.in = lowerstr_with_len(in, len); key.in = lowerstr_with_len(in, len);