circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-05-30 14:16:18 +00:00
Code Issues Projects Releases Wiki Activity

Check time inside repeat (R:) loop as well.

Browse Source
This commit is contained in:
nicm
2026-05-01 09:34:05 +00:00
parent 4a926e489b
commit a2acf0f7cf
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
format.c
View File

@@ -4225,6 +4225,20 @@ format_choose(struct format_expand_state *es, const char *s, char **left,
return (0); return (0);
} }
/* Check format has not taken too lon. */
static int
format_check_time(struct format_expand_state *es)
{
uint64_t t = get_timer();
if (t - es->start_time < FORMAT_TIME_LIMIT)
return (1);
t -= es->start_time;
format_log(es, "reached time limit (%llu)", (unsigned long long)t);
return (0);
}
/* Is this true? */ /* Is this true? */
int int
format_true(const char *s) format_true(const char *s)
@@ -5247,6 +5261,8 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
else { else {
value = xstrdup(""); value = xstrdup("");
for (i = 0; i < nrep; i++) { for (i = 0; i < nrep; i++) {
if (!format_check_time(es))
goto fail;
xasprintf(&new, "%s%s", value, left); xasprintf(&new, "%s%s", value, left);
free(value); free(value);
value = new; value = new;
@@ -5520,16 +5536,10 @@ format_expand1(struct format_expand_state *es, const char *fmt)
size_t off, len, n, outlen; size_t off, len, n, outlen;
int ch, brackets; int ch, brackets;
char expanded[8192]; char expanded[8192];
uint64_t t = get_timer();
if (fmt == NULL || *fmt == '\0') if (fmt == NULL || *fmt == '\0' || !format_check_time(es))
return (xstrdup("")); return (xstrdup(""));
if (t - es->start_time >= FORMAT_TIME_LIMIT) {
format_log(es, "reached time limit (%llu)",
(unsigned long long)(t - es->start_time));
return (xstrdup(""));
}
if (es->loop == FORMAT_LOOP_LIMIT) { if (es->loop == FORMAT_LOOP_LIMIT) {
format_log(es, "reached loop limit (%u)", FORMAT_LOOP_LIMIT); format_log(es, "reached loop limit (%u)", FORMAT_LOOP_LIMIT);
return (xstrdup("")); return (xstrdup(""));