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:14 +00:00
parent 201e5b282b
commit b140711643
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
* $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.24 2009/07/16 06:33:44 petere Exp $
* $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.25 2009/10/13 14:33:14 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -959,17 +959,21 @@ ts_setup_firstcall(FunctionCallInfo fcinfo, FuncCallContext *funcctx,
node = stat->root;
/* find leftmost value */
for (;;)
{
stat->stack[stat->stackpos] = node;
if (node->left)
if (node == NULL)
stat->stack[stat->stackpos] = NULL;
else
for (;;)
{
stat->stackpos++;
node = node->left;
stat->stack[stat->stackpos] = node;
if (node->left)
{
stat->stackpos++;
node = node->left;
}
else
break;
}
else
break;
}
Assert(stat->stackpos <= stat->maxdepth);
tupdesc = CreateTemplateTupleDesc(3, false);
TupleDescInitEntry(tupdesc, (AttrNumber) 1, "word",
@ -1015,6 +1019,7 @@ walkStatEntryTree(TSVectorStat *stat)
else
break;
}
Assert(stat->stackpos <= stat->maxdepth);
}
else
{