circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-04-16 03:56:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-04-05 16:01:08 +01:00
parent 42dafcc62a d5ed967f58
commit 0ee18d4421
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
format.c
View File

@@ -84,6 +84,12 @@ format_job_cmp(struct format_job *fj1, struct format_job *fj2)
return (strcmp(fj1->cmd, fj2->cmd)); return (strcmp(fj1->cmd, fj2->cmd));
} }
/* Maimum pad and trim width. */
#define FORMAT_MAX_WIDTH 10000
/* Maimum repeat size. */
#define FORMAT_MAX_REPEAT 10000
/* Format modifiers. */ /* Format modifiers. */
#define FORMAT_TIMESTRING 0x1 #define FORMAT_TIMESTRING 0x1
#define FORMAT_BASENAME 0x2 #define FORMAT_BASENAME 0x2
@@ -5007,8 +5013,8 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
case '=': case '=':
if (fm->argc < 1) if (fm->argc < 1)
break; break;
limit = strtonum(fm->argv[0], INT_MIN + 1, limit = strtonum(fm->argv[0], -FORMAT_MAX_WIDTH,
INT_MAX, &errstr); FORMAT_MAX_WIDTH, &errstr);
if (errstr != NULL) if (errstr != NULL)
limit = 0; limit = 0;
if (fm->argc >= 2 && fm->argv[1] != NULL) if (fm->argc >= 2 && fm->argv[1] != NULL)
@@ -5017,8 +5023,8 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
case 'p': case 'p':
if (fm->argc < 1) if (fm->argc < 1)
break; break;
width = strtonum(fm->argv[0], INT_MIN + 1, width = strtonum(fm->argv[0], -FORMAT_MAX_WIDTH,
INT_MAX, &errstr); FORMAT_MAX_WIDTH, &errstr);
if (errstr != NULL) if (errstr != NULL)
width = 0; width = 0;
break; break;
@@ -5241,7 +5247,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
format_log(es, "repeat syntax error: %s", copy); format_log(es, "repeat syntax error: %s", copy);
goto fail; goto fail;
} }
nrep = strtonum(right, 1, 10000, &errstr); nrep = strtonum(right, 1, FORMAT_MAX_REPEAT, &errstr);
if (errstr != NULL) if (errstr != NULL)
value = xstrdup(""); value = xstrdup("");
else { else {