1
0
mirror of https://github.com/openbsd/src.git synced 2026-06-18 15:23:33 +02:00

Require layout prefix to be 5 characters, GitHub issue 5067 from

cglosner at gmail dot com.
This commit is contained in:
nicm
2026-05-07 09:21:05 +00:00
parent dad04fec3d
commit 045ee73f86
2 changed files with 6 additions and 5 deletions
+4 -3
View File
@@ -1,4 +1,4 @@
/* $OpenBSD: layout-custom.c,v 1.24 2026/04/04 16:40:27 nicm Exp $ */
/* $OpenBSD: layout-custom.c,v 1.25 2026/05/07 09:21:05 nicm Exp $ */
/*
* Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -160,13 +160,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);
+2 -2
View File
@@ -1,4 +1,4 @@
/* $OpenBSD: window-copy.c,v 1.397 2026/05/07 09:15:44 nicm Exp $ */
/* $OpenBSD: window-copy.c,v 1.398 2026/05/07 09:21:05 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -469,7 +469,7 @@ window_copy_init(struct window_mode_entry *wme,
struct screen *base = &wp->base;
struct screen_write_ctx ctx;
u_int i, cx, cy;
data = window_copy_common_init(wme);
data->backing = window_copy_clone_screen(base, &data->screen, &cx, &cy,
wme->swp != wme->wp);