Make gistindex_keytest safe against NULL values. Same fix was already

made in passing for 8.0, but now that we have a bug report showing it's
needed, we should put it into 7.4 branch.

diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index b89434315edb0d3afa73858402d619d443a4e01f..942b2c5c3c29d7f8c2102f8d32190dffa5b1c4f4 100644 (file)
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -234,16 +234,16 @@ gistindex_keytest(IndexTuple tuple,
                                                          key[0].sk_attno,
                                                          giststate->tupdesc,
                                                          &isNull);
+               /* is the index entry NULL? */
                if (isNull)
                {
                        /* XXX eventually should check if SK_ISNULL */
                        return false;
                }
-
-/* this code from backend/access/common/indexvalid.c. But why and what???
+               /* is the compared-to datum NULL? */
                if (key[0].sk_flags & SK_ISNULL)
                        return false;
-*/
+
                gistdentryinit(giststate, key[0].sk_attno - 1, &de,
                                           datum, r, p, offset,
                                           IndexTupleSize(tuple) - sizeof(IndexTupleData),