upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-04-06 17:55:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix more multibyte issues in ltree.

Browse source 
Commit 84d5efa7e3 missed some multibyte issues caused by short-circuit
logic in the callers. The callers assumed that if the predicate string
is longer than the label string, then it couldn't possibly be a match,
but it can be when using case-insensitive matching (LVAR_INCASE) if
casefolding changes the byte length.

Fix by refactoring to get rid of the short-circuit logic as well as
the function pointer, and consolidate the logic in a replacement
function ltree_label_match().

Discussion: https://postgr.es/m/02c6ef6cf56a5013ede61ad03c7a26affd27d449.camel@j-davis.com
Backpatch-through: 14
This commit is contained in:
Jeff Davis 2026-02-26 12:26:13 -08:00
parent e22821c7bd
commit 2b993167fc
3 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
contrib/ltree/lquery_op.c
View file

@ -41,8 +41,7 @@ getlexeme(char *start, char *end, int *len)
}
bool
compare_subnode(ltree_level *t, char *qn, int len,
ltree_prefix_eq_func prefix_eq, bool anyend)
compare_subnode(ltree_level *t, char *qn, int len, bool prefix, bool ci)
{
char *endt = t->name + t->len;
char *endq = qn + len;
@ -57,10 +56,8 @@ compare_subnode(ltree_level *t, char *qn, int len,
isok = false;
while ((tn = getlexeme(tn, endt, &lent)) != NULL)
{
if ((lent == lenq || (lent > lenq && anyend)) &&
(*prefix_eq) (qn, lenq, tn, lent))
if (ltree_label_match(qn, lenq, tn, lent, prefix, ci))
{
isok = true;
break;
}
@ -76,31 +73,40 @@ compare_subnode(ltree_level *t, char *qn, int len,
}
/*
* Check if 'a' is a prefix of 'b'.
* Check if the label matches the predicate string. If 'prefix' is true, then
* the predicate string is treated as a prefix. If 'ci' is true, then the
* predicate string is case-insensitive (and locale-aware).
*/
bool
ltree_prefix_eq(const char *a, size_t a_sz, const char *b, size_t b_sz)
ltree_label_match(const char *pred, size_t pred_len, const char *label,
size_t label_len, bool prefix, bool ci)
{
if (a_sz > b_sz)
return false;
else
return (strncmp(a, b, a_sz) == 0);
}
/*
* Case-insensitive check if 'a' is a prefix of 'b'.
*/
bool
ltree_prefix_eq_ci(const char *a, size_t a_sz, const char *b, size_t b_sz)
{
char *al = str_tolower(a, a_sz, DEFAULT_COLLATION_OID);
char *bl = str_tolower(b, b_sz, DEFAULT_COLLATION_OID);
char *fpred; /* casefolded predicate */
size_t fpred_len;
char *flabel; /* casefolded label */
size_t flabel_len;
bool res;
res = (strncmp(al, bl, a_sz) == 0);
/* fast path for binary match or binary prefix match */
if ((pred_len == label_len || (prefix && pred_len < label_len)) &&
strncmp(pred, label, pred_len) == 0)
return true;
else if (!ci)
return false;
pfree(al);
pfree(bl);
fpred = str_tolower(pred, pred_len, DEFAULT_COLLATION_OID);
fpred_len = strlen(fpred);
flabel = str_tolower(label, label_len, DEFAULT_COLLATION_OID);
flabel_len = strlen(flabel);
if ((fpred_len == flabel_len || (prefix && fpred_len < flabel_len)) &&
strncmp(fpred, flabel, fpred_len) == 0)
res = true;
else
res = false;
pfree(fpred);
pfree(flabel);
return res;
}
@ -125,19 +131,16 @@ checkLevel(lquery_level *curq, ltree_level *curt)
for (int i = 0; i < curq->numvar; i++)
{
ltree_prefix_eq_func prefix_eq;
prefix_eq = (curvar->flag & LVAR_INCASE) ? ltree_prefix_eq_ci : ltree_prefix_eq;
bool prefix = (curvar->flag & LVAR_ANYEND);
bool ci = (curvar->flag & LVAR_INCASE);
if (curvar->flag & LVAR_SUBLEXEME)
{
if (compare_subnode(curt, curvar->name, curvar->len, prefix_eq,
(curvar->flag & LVAR_ANYEND)))
if (compare_subnode(curt, curvar->name, curvar->len, prefix, ci))
return success;
}
else if ((curvar->len == curt->len ||
(curt->len > curvar->len && (curvar->flag & LVAR_ANYEND))) &&
(*prefix_eq) (curvar->name, curvar->len, curt->name, curt->len))
else if (ltree_label_match(curvar->name, curvar->len, curt->name,
curt->len, prefix, ci))
return success;
curvar = LVAR_NEXT(curvar);

10
contrib/ltree/ltree.h
View file

@ -157,8 +157,6 @@ typedef struct
char data[FLEXIBLE_ARRAY_MEMBER];
} ltxtquery;
typedef bool (*ltree_prefix_eq_func) (const char *, size_t, const char *, size_t);
#define HDRSIZEQT MAXALIGN(VARHDRSZ + sizeof(int32))
#define COMPUTESIZE(size,lenofoperand) ( HDRSIZEQT + (size) * sizeof(ITEM) + (lenofoperand) )
#define LTXTQUERY_TOO_BIG(size,lenofoperand) \
@ -209,11 +207,11 @@ bool ltree_execute(ITEM *curitem, void *checkval,
int ltree_compare(const ltree *a, const ltree *b);
bool inner_isparent(const ltree *c, const ltree *p);
bool compare_subnode(ltree_level *t, char *qn, int len,
ltree_prefix_eq_func prefix_eq, bool anyend);
bool compare_subnode(ltree_level *t, char *qn, int len, bool prefix, bool ci);
ltree *lca_inner(ltree **a, int len);
bool ltree_prefix_eq(const char *a, size_t a_sz, const char *b, size_t b_sz);
bool ltree_prefix_eq_ci(const char *a, size_t a_sz, const char *b, size_t b_sz);
bool ltree_label_match(const char *pred, size_t pred_len,
const char *label, size_t label_len,
bool prefix, bool ci);
/* fmgr macros for ltree objects */
#define DatumGetLtreeP(X) ((ltree *) PG_DETOAST_DATUM(X))

11
contrib/ltree/ltxtquery_op.c
View file

@ -58,19 +58,18 @@ checkcondition_str(void *checkval, ITEM *val)
ltree_level *level = LTREE_FIRST(((CHKVAL *) checkval)->node);
int tlen = ((CHKVAL *) checkval)->node->numlevel;
char *op = ((CHKVAL *) checkval)->operand + val->distance;
ltree_prefix_eq_func prefix_eq;
bool prefix = (val->flag & LVAR_ANYEND);
bool ci = (val->flag & LVAR_INCASE);
prefix_eq = (val->flag & LVAR_INCASE) ? ltree_prefix_eq_ci : ltree_prefix_eq;
while (tlen > 0)
{
if (val->flag & LVAR_SUBLEXEME)
{
if (compare_subnode(level, op, val->length, prefix_eq, (val->flag & LVAR_ANYEND)))
if (compare_subnode(level, op, val->length, prefix, ci))
return true;
}
else if ((val->length == level->len ||
(level->len > val->length && (val->flag & LVAR_ANYEND))) &&
(*prefix_eq) (op, val->length, level->name, level->len))
else if (ltree_label_match(op, val->length, level->name, level->len,
prefix, ci))
return true;
tlen--;