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

Fix ts_stat's failure on empty tsvector.

Browse Source 
Also insert a couple of Asserts that check for stack overflow.
Bogus coding appears to be new in 8.4 --- older releases had a much
simpler algorithm here.  Per bug #5111.
This commit is contained in:
Tom Lane 2009-10-13 14:33:21 +00:00
parent 09a12ef929
commit 3d70b5d01a
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/backend/utils/adt/tsvector_op.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.23 2009/06/11 14:49:04 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.23.2.1 2009/10/13 14:33:21 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -959,17 +959,21 @@ ts_setup_firstcall(FunctionCallInfo fcinfo, FuncCallContext *funcctx,
node = stat->root; node = stat->root;
/* find leftmost value */ /* find leftmost value */
for (;;) if (node == NULL)
{ stat->stack[stat->stackpos] = NULL;
stat->stack[stat->stackpos] = node; else
if (node->left) for (;;)
{ {
stat->stackpos++; stat->stack[stat->stackpos] = node;
node = node->left; if (node->left)
{
stat->stackpos++;
node = node->left;
}
else
break;
} }
else Assert(stat->stackpos <= stat->maxdepth);
break;
}
tupdesc = CreateTemplateTupleDesc(3, false); tupdesc = CreateTemplateTupleDesc(3, false);
TupleDescInitEntry(tupdesc, (AttrNumber) 1, "word", TupleDescInitEntry(tupdesc, (AttrNumber) 1, "word",
@ -1015,6 +1019,7 @@ walkStatEntryTree(TSVectorStat *stat)
else else
break; break;
} }
Assert(stat->stackpos <= stat->maxdepth);
} }
else else
{ {