diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-03 00:10:39 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-03 00:10:39 +0000 |
| commit | 57641a165ffa7ef33c21c321a59104db7985df74 (patch) | |
| tree | c020491c51955d51a84020a2961e9656aebaff6d /src/backend/utils/adt/tsquery_util.c | |
| parent | 57d9aefcaa1e16a3eb65ec7f03b8f8f24825f88e (diff) | |
| download | postgresql-57641a165ffa7ef33c21c321a59104db7985df74.tar.gz postgresql-57641a165ffa7ef33c21c321a59104db7985df74.zip | |
Fix core dump in QTNodeCompare when tsquery_cmp() is applied to two empty
tsqueries. CompareTSQ has to have a guard for the case rather than blindly
applying QTNodeCompare to random data past the end of the datums. Also,
change QTNodeCompare to be a little less trusting: use an actual test rather
than just Assert'ing that the input is sane. Problem encountered while
investigating another issue (I saw a core dump in autoanalyze on a table
containing multiple empty tsquery values).
Back-patch to all branches with tsquery support.
In HEAD, also fix some bizarre (though not outright wrong) coding in
tsq_mcontains().
Diffstat (limited to 'src/backend/utils/adt/tsquery_util.c')
| -rw-r--r-- | src/backend/utils/adt/tsquery_util.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c index ce8a892639e..5e309fea7cd 100644 --- a/src/backend/utils/adt/tsquery_util.c +++ b/src/backend/utils/adt/tsquery_util.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_util.c,v 1.13 2010/01/02 16:57:55 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_util.c,v 1.14 2010/08/03 00:10:39 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -113,13 +113,11 @@ QTNodeCompare(QTNode *an, QTNode *bn) } return 0; } - else + else if (an->valnode->type == QI_VAL) { QueryOperand *ao = &an->valnode->qoperand; QueryOperand *bo = &bn->valnode->qoperand; - Assert(an->valnode->type == QI_VAL); - if (ao->valcrc != bo->valcrc) { return (ao->valcrc > bo->valcrc) ? -1 : 1; @@ -127,6 +125,11 @@ QTNodeCompare(QTNode *an, QTNode *bn) return tsCompareString(an->word, ao->length, bn->word, bo->length, false); } + else + { + elog(ERROR, "unrecognized QueryItem type: %d", an->valnode->type); + return 0; /* keep compiler quiet */ + } } static int |