Fix bug corrupting query in gist consistent function.

Thank to Mario Weilguni <mweilguni@sime.com> to discover a bug.

diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index 2166fa2efb68a3fa31c13f458175bd689dbc00db..a236058ecec3860534dba5973dfb5a8e2e464e92 100644 (file)
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -609,6 +609,7 @@ gist_qe(ltree_gist * key, lquery * query)
                curq = LQL_NEXT(curq);
                qlen--;
        }
+       PG_FREE_IF_COPY(query,1);
 
        return true;
 }

diff --git a/contrib/ltree/ltree.h b/contrib/ltree/ltree.h
index 606b3e3a74756d67079c8d24122abc9c34fe24ba..ec49c66fbc2edd57c66f7e14aa6f86aecb5622b0 100644 (file)
--- a/contrib/ltree/ltree.h
+++ b/contrib/ltree/ltree.h
@@ -167,8 +167,11 @@ bool compare_subnode(ltree_level * t, char *q, int len,
 ltree     *lca_inner(ltree ** a, int len);
 
 #define PG_GETARG_LTREE(x)     ((ltree*)DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_DATUM(x))))
+#define PG_GETARG_LTREE_COPY(x)        ((ltree*)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(x))))
 #define PG_GETARG_LQUERY(x) ((lquery*)DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_DATUM(x))))
+#define PG_GETARG_LQUERY_COPY(x) ((lquery*)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(x))))
 #define PG_GETARG_LTXTQUERY(x) ((ltxtquery*)DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_DATUM(x))))
+#define PG_GETARG_LTXTQUERY_COPY(x) ((ltxtquery*)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(x))))
 
 /* GiST support for ltree */
 

diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
index 5c5f4c7d6dc669f92de595af0145efa5bfc5093a..58cc9e7622aaa4a6d54a38e1f1f6ff9c72de3f45 100644 (file)
--- a/contrib/ltree/ltree_gist.c
+++ b/contrib/ltree/ltree_gist.c
@@ -601,7 +601,7 @@ Datum
 ltree_consistent(PG_FUNCTION_ARGS)
 {
        GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-       char       *query = (char *) DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_DATUM(1)));
+       void       *query = NULL;
        ltree_gist *key = (ltree_gist *) DatumGetPointer(entry->key);
        StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
        bool            res = false;
@@ -613,15 +613,18 @@ ltree_consistent(PG_FUNCTION_ARGS)
        switch (strategy)
        {
                case BTLessStrategyNumber:
+                       query = PG_GETARG_LTREE(1);
                        res = (GIST_LEAF(entry)) ?
                                (ltree_compare((ltree *) query, LTG_NODE(key)) > 0)
                                :
                                (ltree_compare((ltree *) query, LTG_GETLNODE(key)) >= 0);
                        break;
                case BTLessEqualStrategyNumber:
+                       query = PG_GETARG_LTREE(1);
                        res = (ltree_compare((ltree *) query, LTG_GETLNODE(key)) >= 0);
                        break;
                case BTEqualStrategyNumber:
+                       query = PG_GETARG_LTREE(1);
                        if (GIST_LEAF(entry))
                                res = (ltree_compare((ltree *) query, LTG_NODE(key)) == 0);
                        else
@@ -632,21 +635,25 @@ ltree_consistent(PG_FUNCTION_ARGS)
                                        );
                        break;
                case BTGreaterEqualStrategyNumber:
+                       query = PG_GETARG_LTREE(1);
                        res = (ltree_compare((ltree *) query, LTG_GETRNODE(key)) <= 0);
                        break;
                case BTGreaterStrategyNumber:
+                       query = PG_GETARG_LTREE(1);
                        res = (GIST_LEAF(entry)) ?
                                (ltree_compare((ltree *) query, LTG_GETRNODE(key)) < 0)
                                :
                                (ltree_compare((ltree *) query, LTG_GETRNODE(key)) <= 0);
                        break;
                case 10:
+                       query = PG_GETARG_LTREE_COPY(1);
                        res = (GIST_LEAF(entry)) ?
                                inner_isparent((ltree *) query, LTG_NODE(key))
                                :
                                gist_isparent(key, (ltree *) query);
                        break;
                case 11:
+                       query = PG_GETARG_LTREE_COPY(1);
                        res = (GIST_LEAF(entry)) ?
                                inner_isparent(LTG_NODE(key), (ltree *) query)
                                :
@@ -654,6 +661,7 @@ ltree_consistent(PG_FUNCTION_ARGS)
                        break;
                case 12:
                case 13:
+                       query = PG_GETARG_LQUERY(1);
                        if (GIST_LEAF(entry))
                                res = DatumGetBool(DirectFunctionCall2(ltq_regex,
                                                                                  PointerGetDatum(LTG_NODE(key)),
@@ -664,6 +672,7 @@ ltree_consistent(PG_FUNCTION_ARGS)
                        break;
                case 14:
                case 15:
+                       query = PG_GETARG_LQUERY(1);
                        if (GIST_LEAF(entry))
                                res = DatumGetBool(DirectFunctionCall2(ltxtq_exec,
                                                                                  PointerGetDatum(LTG_NODE(key)),
@@ -675,5 +684,7 @@ ltree_consistent(PG_FUNCTION_ARGS)
                default:
                        elog(ERROR, "Unknown StrategyNumber: %d", strategy);
        }
+
+       PG_FREE_IF_COPY(query,1);
        PG_RETURN_BOOL(res);
 }