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().

diff --git a/src/backend/utils/adt/tsquery_op.c b/src/backend/utils/adt/tsquery_op.c
index 6b7e976a4315d133159665017cf681b3a88fd5dd..41797b5e6a13a70533fb696bb29964206145292d 100644 (file)
--- a/src/backend/utils/adt/tsquery_op.c
+++ b/src/backend/utils/adt/tsquery_op.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_op.c,v 1.6 2009/06/11 14:49:04 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_op.c,v 1.6.2.1 2010/08/03 00:10:52 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -149,7 +149,7 @@ CompareTSQ(TSQuery a, TSQuery b)
        {
                return (VARSIZE(a) < VARSIZE(b)) ? -1 : 1;
        }
-       else
+       else if (a->size != 0)
        {
                QTNode     *an = QT2QTN(GETQUERY(a), GETOPERAND(a));
                QTNode     *bn = QT2QTN(GETQUERY(b), GETOPERAND(b));

diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c
index 9efd5fa8d3bd827f19ef2f99f2cae6ed1f59317c..831936696b722272089f9cd8593aaa2353a70af0 100644 (file)
--- 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.11 2009/06/11 14:49:04 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_util.c,v 1.11.2.1 2010/08/03 00:10:52 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->operand;
                QueryOperand *bo = &bn->valnode->operand;
 
-               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