circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-08 08:58:47 +00:00
Code Issues Projects Releases Wiki Activity

Add a limit on how far format_expand can recurse.

Browse Source
This commit is contained in:
nicm 2019-03-14 23:34:41 +00:00
parent 10d60faba5
commit 25e2e22791
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
format.c
View File

@ -100,6 +100,9 @@ format_job_cmp(struct format_job *fj1, struct format_job *fj2)
#define FORMAT_WINDOWS 0x100 #define FORMAT_WINDOWS 0x100
#define FORMAT_PANES 0x200 #define FORMAT_PANES 0x200
/* Limit on recursion. */
#define FORMAT_LOOP_LIMIT 10
/* Entry in format tree. */ /* Entry in format tree. */
struct format_entry { struct format_entry {
char *key; char *key;
@ -122,6 +125,7 @@ struct format_tree {
u_int tag; u_int tag;
int flags; int flags;
time_t time; time_t time;
u_int loop;
RB_HEAD(format_entry_tree, format_entry) tree; RB_HEAD(format_entry_tree, format_entry) tree;
}; };
@ -1512,6 +1516,10 @@ format_expand(struct format_tree *ft, const char *fmt)
if (fmt == NULL) if (fmt == NULL)
return (xstrdup("")); return (xstrdup(""));
if (ft->loop == FORMAT_LOOP_LIMIT)
return (xstrdup(""));
ft->loop++;
len = 64; len = 64;
buf = xmalloc(len); buf = xmalloc(len);
off = 0; off = 0;
@ -1606,6 +1614,8 @@ format_expand(struct format_tree *ft, const char *fmt)
buf[off] = '\0'; buf[off] = '\0';
log_debug("%s: '%s' -> '%s'", __func__, saved, buf); log_debug("%s: '%s' -> '%s'", __func__, saved, buf);
ft->loop--;
return (buf); return (buf);
} }