diff options
| author | Teodor Sigaev <teodor@sigaev.ru> | 2007-09-26 10:44:54 +0000 |
|---|---|---|
| committer | Teodor Sigaev <teodor@sigaev.ru> | 2007-09-26 10:44:54 +0000 |
| commit | 45cd13c8ab05aef5a334bca8a2d1e9a1b9b8815e (patch) | |
| tree | 4fbc0c5335ac4848d162555245cd3b3046d90aa2 | |
| parent | a51302deb3d0df960dcce6feb165991d5ab0290f (diff) | |
| download | postgresql-45cd13c8ab05aef5a334bca8a2d1e9a1b9b8815e.tar.gz postgresql-45cd13c8ab05aef5a334bca8a2d1e9a1b9b8815e.zip | |
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 f3afc9f2cd1..d823231067a 100644 --- a/contrib/tsearch2/tsvector.c +++ b/contrib/tsearch2/tsvector.c @@ -580,7 +580,12 @@ compareWORD(const void *a, const void *b) ((WORD *) b)->len); if (res == 0) + { + if ( ((WORD *) a)->pos.pos == ((WORD *) b)->pos.pos ) + return 0; + return (((WORD *) a)->pos.pos > ((WORD *) b)->pos.pos) ? 1 : -1; + } return res; } return (((WORD *) a)->len > ((WORD *) b)->len) ? 1 : -1; @@ -630,7 +635,8 @@ uniqueWORD(WORD * 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) { |