Merge branch 'master' into floating_panes

This commit is contained in:
Nicholas Marriott
2026-05-12 12:38:31 +01:00
41 changed files with 1075 additions and 254 deletions

View File

@@ -183,13 +183,14 @@ layout_parse(struct window *w, const char *layout, char **cause)
struct window_pane *wp;
u_int npanes, ncells, sx = 0, sy = 0;
u_short csum;
int n;
/* Check validity. */
if (sscanf(layout, "%hx,", &csum) != 1) {
if (sscanf(layout, "%hx,%n", &csum, &n) != 1 || n != 5) {
*cause = xstrdup("invalid layout");
return (-1);
}
layout += 5;
layout += n;
if (csum != layout_checksum(layout)) {
*cause = xstrdup("invalid layout");
return (-1);