circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-11 21:14:21 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Add a nesting limit for v1 layouts, reported by M Khalilov, fix based on issue 5572 from Afonso Januário. Also tweak some language while here.
This commit is contained in:
tmux update bot
2026-09-09 19:23:09 +00:00
parent 4839123510 b7c5030004
commit 13c10f672c
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
layout-custom.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: layout-custom.c,v 1.40 2026/09/09 07:03:39 nicm Exp $ */ /* $OpenBSD: layout-custom.c,v 1.41 2026/09/09 09:01:19 nicm Exp $ */
/* /*
* Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -28,8 +28,8 @@
#include "tmux.h" #include "tmux.h"
/* /*
* Layouts can be represented as strings in a JSON format (v2). The legacy * Layouts can be represented as strings in a JSON format (v2). The version 1
* format (v1) will be removed in the future and should no longer be used. * format will be removed in the future and should no longer be used.
* *
* The current (v2) format is JSON. The top level has two keys: * The current (v2) format is JSON. The top level has two keys:
* "V": version number, currently 2 * "V": version number, currently 2
@@ -57,6 +57,9 @@
* "z": z-index, if a floating pane * "z": z-index, if a floating pane
*/ */
/* Maximum nesting depth for version 1 layouts. */
#define LAYOUT_V1_MAX_DEPTH 1000
/* Layout string. */ /* Layout string. */
struct layout_string { struct layout_string {
char *dat; char *dat;
@@ -362,7 +365,7 @@ layout_append_v2(struct layout_cell *lc, struct layout_string *ls)
return (0); return (0);
} }
/* Append information for a single cell in the legacy (v1) format. */ /* Append information for a single cell in the version 1 format. */
static int static int
layout_append_v1(struct layout_cell *lc, struct layout_string *ls) layout_append_v1(struct layout_cell *lc, struct layout_string *ls)
{ {
@@ -778,7 +781,7 @@ layout_assign(struct window *w, struct layout_parse_ctx *pctx)
layout_assign_fallback(w, w->layout_root); layout_assign_fallback(w, w->layout_root);
} }
/* Construct a cell from the legacy (v1) format. */ /* Construct a cell from the version 1 format. */
static struct layout_cell * static struct layout_cell *
layout_construct_cell(struct layout_cell *lcparent, const char **layout) layout_construct_cell(struct layout_cell *lcparent, const char **layout)
{ {
@@ -827,12 +830,15 @@ layout_construct_cell(struct layout_cell *lcparent, const char **layout)
return (lc); return (lc);
} }
/* Construct a layout from the legacy (v1) format. */ /* Construct a layout from the version 1 format. */
static struct layout_cell * static struct layout_cell *
layout_construct_v1(struct layout_cell *lcparent, const char **layout) layout_construct_v1(struct layout_cell *lcparent, const char **layout, u_int depth)
{ {
struct layout_cell *lc, *lcchild; struct layout_cell *lc, *lcchild;
if (depth > LAYOUT_V1_MAX_DEPTH)
return (NULL);
lc = layout_construct_cell(lcparent, layout); lc = layout_construct_cell(lcparent, layout);
if (lc == NULL) if (lc == NULL)
return (NULL); return (NULL);
@@ -855,7 +861,7 @@ layout_construct_v1(struct layout_cell *lcparent, const char **layout)
do { do {
(*layout)++; (*layout)++;
lcchild = layout_construct_v1(lc, layout); lcchild = layout_construct_v1(lc, layout, depth + 1);
if (lcchild == NULL) if (lcchild == NULL)
goto fail; goto fail;
TAILQ_INSERT_TAIL(&lc->cells, lcchild, entry); TAILQ_INSERT_TAIL(&lc->cells, lcchild, entry);
@@ -1068,7 +1074,8 @@ layout_construct(const char *input, struct layout_parse_ctx *pctx)
*pctx->cause = xstrdup("invalid layout checksum"); *pctx->cause = xstrdup("invalid layout checksum");
return (-1); return (-1);
} }
if ((pctx->root = layout_construct_v1(NULL, &input)) == NULL) { pctx->root = layout_construct_v1(NULL, &input, 0);
if (pctx->root == NULL) {
*pctx->cause = xstrdup("invalid layout"); *pctx->cause = xstrdup("invalid layout");
return (-1); return (-1);
} }