diff options
| author | Teodor Sigaev <teodor@sigaev.ru> | 2007-09-26 10:39:15 +0000 |
|---|---|---|
| committer | Teodor Sigaev <teodor@sigaev.ru> | 2007-09-26 10:39:15 +0000 |
| commit | 76e114a458a29aab68ccf466b9e95f9dbac8a033 (patch) | |
| tree | 87e0ea6f2e1efa2cd03af67ea843eb4460c44de4 | |
| parent | 46dcd202ef39374a57d9f8278399bcb315428ecb (diff) | |
Fix crash of to_tsvector() function on huge input: compareWORD()
function didn't return correct result for word position greate than
limit.
Per report from Stuart Bishop <stuart@stuartbishop.net>
| -rw-r--r-- | contrib/tsearch2/tsvector.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/tsearch2/tsvector.c b/contrib/tsearch2/tsvector.c index 888367c8293..6570ac4e393 100644 --- a/contrib/tsearch2/tsvector.c +++ b/contrib/tsearch2/tsvector.c @@ -582,7 +582,12 @@ compareWORD(const void *a, const void *b) ((TSWORD *) b)->len); if (res == 0) + { + if ( ((TSWORD *) a)->pos.pos == ((TSWORD *) b)->pos.pos ) + return 0; + return (((TSWORD *) a)->pos.pos > ((TSWORD *) b)->pos.pos) ? 1 : -1; + } return res; } return (((TSWORD *) a)->len > ((TSWORD *) b)->len) ? 1 : -1; @@ -632,7 +637,8 @@ uniqueWORD(TSWORD * a, int4 l) else { pfree(ptr->word); - if (res->pos.apos[0] < MAXNUMPOS - 1 && res->pos.apos[res->pos.apos[0]] != MAXENTRYPOS - 1) + if (res->pos.apos[0] < MAXNUMPOS - 1 && res->pos.apos[res->pos.apos[0]] != MAXENTRYPOS - 1 && + res->pos.apos[res->pos.apos[0]] != LIMITPOS(ptr->pos.pos) ) { if (res->pos.apos[0] + 1 >= res->alen) { |