circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-20 17:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-06-18 13:00:05 +01:00
parent 6d9fbb0e97 cba4ba9cdc
commit 3246331876
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
format.c
View File

@@ -128,6 +128,9 @@ format_job_cmp(struct format_job *fj1, struct format_job *fj2)
/* Limit on time taken (milliseconds). */
#define FORMAT_TIME_LIMIT 100
/* How often to check the time in long loops. */
#define FORMAT_TIME_LOOP_CHECK 10000
/* Format expand flags. */
#define FORMAT_EXPAND_TIME 0x1
#define FORMAT_EXPAND_NOJOBS 0x2
@@ -4237,10 +4240,14 @@ found:
/* Check if format has not taken too long. */
static int
format_check_time(struct format_expand_state *es)
format_check_time(struct format_expand_state *es, u_int *check)
{
uint64_t t = get_timer();
uint64_t t;
if (check != NULL && ++*check % FORMAT_TIME_LOOP_CHECK != 0)
return (1);
t = get_timer();
if (t - es->start_time < FORMAT_TIME_LIMIT)
return (1);
t -= es->start_time;
@@ -4255,10 +4262,11 @@ format_unescape(struct format_expand_state *es, const char *s)
{
char *out, *cp;
int brackets = 0;
u_int check = 0;
cp = out = xmalloc(strlen(s) + 1);
for (; *s != '\0'; s++) {
if (!format_check_time(es)){
if (!format_check_time(es, &check)) {
free(out);
return (xstrdup(""));
}
@@ -4284,10 +4292,11 @@ format_strip(struct format_expand_state *es, const char *s)
{
char *out, *cp;
int brackets = 0;
u_int check = 0;
cp = out = xmalloc(strlen(s) + 1);
for (; *s != '\0'; s++) {
if (!format_check_time(es)){
if (!format_check_time(es, &check)) {
free(out);
return (xstrdup(""));
}
@@ -4311,9 +4320,10 @@ static const char *
format_skip1(struct format_expand_state *es, const char *s, const char *end)
{
int brackets = 0;
u_int check = 0;
for (; *s != '\0'; s++) {
if (es != NULL && !format_check_time(es))
if (es != NULL && !format_check_time(es, &check))
return (NULL);
if (*s == '#' && s[1] == '{')
brackets++;
@@ -5119,7 +5129,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
struct format_modifier *list, *cmp = NULL, *search = NULL;
struct format_modifier **sub = NULL, *mexp = NULL, *fm;
struct format_modifier *bool_op_n = NULL;
u_int i, count, nsub = 0, nrep;
u_int i, count, nsub = 0, nrep, check = 0;
struct format_expand_state next;
struct environ_entry *envent;
@@ -5452,7 +5462,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
else {
value = xstrdup("");
for (i = 0; i < nrep; i++) {
if (!format_check_time(es)) {
if (!format_check_time(es, &check)) {
free(right);
free(left);
free(value);
@@ -5732,7 +5742,7 @@ format_expand1(struct format_expand_state *es, const char *fmt)
int ch, brackets;
char expanded[8192];
if (fmt == NULL || *fmt == '\0' || !format_check_time(es))
if (fmt == NULL || *fmt == '\0' || !format_check_time(es, NULL))
return (xstrdup(""));
if (es->loop == FORMAT_LOOP_LIMIT) {