circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-07 02:04:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Do not try to decode UTF-8 if it is too long to match the pattern.
  Do not allocate for repeat inside loop but allocate up front and just copy in the loop.
This commit is contained in:
tmux update bot
2026-09-28 21:22:23 +00:00
parent 4bb0cc98d3 95aaa6cc2a
commit bef6f61b6f
2 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
format.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: format.c,v 1.420 2026/09/28 16:23:56 nicm Exp $ */
/* $OpenBSD: format.c,v 1.421 2026/09/28 16:52:55 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -6019,7 +6019,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
char *time_format = NULL;
char *copy0, *condition, *found, *new;
char *value, *left, *right;
size_t valuelen;
size_t n;
uint64_t modifiers = 0;
int limit = 0, width = 0;
int j, c;
@@ -6426,17 +6426,15 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
if (errstr != NULL)
value = xstrdup("");
else {
value = xstrdup("");
for (i = 0; i < nrep; i++) {
if (!format_check_time(es, NULL)) {
free(right);
free(left);
free(value);
goto fail;
}
xasprintf(&new, "%s%s", value, left);
free(value);
value = new;
n = strlen(left);
if (n != 0 && nrep > (SIZE_MAX - 1) / n) {
format_log(es, "repeat is too long: %s", copy);
value = xstrdup("");
} else {
value = xmalloc((nrep * n) + 1);
for (i = 0; i < nrep; i++)
memcpy(value + (i * n), left, n);
value[nrep * n] = '\0';
}
}
free(right);
@@ -6670,13 +6668,13 @@ done:
}
/* Expand the buffer and copy in the value. */
valuelen = strlen(value);
while (*len - *off < valuelen + 1) {
n = strlen(value);
while (*len - *off < n + 1) {
*buf = xreallocarray(*buf, 2, *len);
*len *= 2;
}
memcpy(*buf + *off, value, valuelen);
*off += valuelen;
memcpy(*buf + *off, value, n);
*off += n;
format_log(es, "replaced '%s' with '%s'", copy0, value);
free(value);

31
fuzzy.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: fuzzy.c,v 1.1 2026/06/26 14:40:30 nicm Exp $ */
/* $OpenBSD: fuzzy.c,v 1.2 2026/09/28 16:55:08 nicm Exp $ */
/*
* Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -245,16 +245,20 @@ fuzzy_column(const struct fuzzy_char *fc, const u_int *start, const u_int *src,
return (0);
}
/* Decode a UTF-8 term into an array of characters. */
static u_int
fuzzy_decode(const char *tok, size_t len, struct utf8_data *out)
/* Decode a UTF-8 term, stopping if it cannot fit in the given limit. */
static int
fuzzy_decode(const char *tok, size_t len, struct utf8_data *out, u_int limit,
u_int *n)
{
const char *cp = tok, *end = tok + len;
u_int n = 0;
while (cp != end)
cp = fuzzy_decode_one(cp, end, &out[n++]);
return (n);
*n = 0;
while (cp != end) {
if (*n == limit)
return (-1);
cp = fuzzy_decode_one(cp, end, &out[(*n)++]);
}
return (0);
}
/* Add the score for a fuzzy token matched at the given positions. */
@@ -474,7 +478,8 @@ fuzzy_match_term(const struct fuzzy_term *term, struct utf8_data *tok,
u_int toklen;
int value = 0, matched_term;
toklen = fuzzy_decode(term->text, term->len, tok);
if (fuzzy_decode(term->text, term->len, tok, ncs, &toklen) != 0)
return (term->inverse);
if (term->exact) {
matched_term = fuzzy_match_exact(tok, toklen, cs, ncs, fold,
term->prefix, term->suffix, &value,
@@ -539,6 +544,7 @@ fuzzy_match(const char *pattern, const char *text, u_int width, u_int *score)
u_int src[STYLE_ALIGN_ABSOLUTE_CENTRE + 1];
u_int vis[STYLE_ALIGN_ABSOLUTE_CENTRE + 1];
u_int wl, wc, wr, wa;
size_t toksize;
const char *cp, *sp;
int bestscore = 0, groupscore, found = 0, fold;
@@ -567,7 +573,12 @@ fuzzy_match(const char *pattern, const char *text, u_int width, u_int *score)
cs = fuzzy_scan(text, &ncs, widths);
matched = xcalloc(ncs == 0 ? 1 : ncs, sizeof *matched);
best = xcalloc(ncs == 0 ? 1 : ncs, sizeof *best);
tok = xreallocarray(NULL, strlen(pattern) + 1, sizeof *tok);
/* A term with more characters than the text cannot match. */
toksize = strlen(pattern);
if (toksize > ncs)
toksize = ncs;
tok = xreallocarray(NULL, toksize == 0 ? 1 : toksize, sizeof *tok);
/* Match each |-separated group and keep the best-scoring one. */
cp = pattern;