From 79aabd140d2c8d182c7898a1d0b0607bbf4ed870 Mon Sep 17 00:00:00 2001 From: Teodor Sigaev Date: Tue, 11 Jul 2006 16:11:06 +0000 Subject: [PATCH] Fix bug corrupting query in gist consistent function. Thank to Mario Weilguni to discover a bug. --- contrib/ltree/_ltree_gist.c | 1 + contrib/ltree/ltree.h | 3 +++ contrib/ltree/ltree_gist.c | 13 ++++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c index 2166fa2efb6..a236058ecec 100644 --- 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 606b3e3a747..ec49c66fbc2 100644 --- 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 5c5f4c7d6dc..58cc9e7622a 100644 --- 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); } -- 2.39.5