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

Empty string for invalid old-style formats causes old iTerm2 versions to crash,

Browse Source 
so emit "0000," instead.
This commit is contained in:
nicm
2026-09-20 08:37:47 +00:00
committed by tmux update bot
parent 2e9189c01d
commit bbd00148de
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
layout-custom.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: layout-custom.c,v 1.41 2026/09/09 09:01:19 nicm Exp $ */ /* $OpenBSD: layout-custom.c,v 1.42 2026/09/20 08:37:47 nicm Exp $ */
/* /*
* Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -283,26 +283,28 @@ layout_checksum(const char *layout)
char * char *
layout_dump(__unused struct window *w, struct layout_cell *lcroot, int flags) layout_dump(__unused struct window *w, struct layout_cell *lcroot, int flags)
{ {
struct layout_string layout_string; struct layout_string layout_string = { 0 };
char *out = NULL; char *out;
if (lcroot == NULL) if (lcroot == NULL)
return NULL; goto bad;
layout_string_init(&layout_string); layout_string_init(&layout_string);
if (layout_append(lcroot, &layout_string, flags) != 0)
if (layout_append(lcroot, &layout_string, flags) == 0) { goto bad;
if (flags & LAYOUT_CUSTOM_OLD_FORMAT) if (~flags & LAYOUT_CUSTOM_OLD_FORMAT)
xasprintf(&out, "%04hx,%s", xasprintf(&out, "{\"V\":2,\"L\":%s}", layout_string.dat);
layout_checksum(layout_string.dat), else {
layout_string.dat); xasprintf(&out, "%04hx,%s", layout_checksum(layout_string.dat),
else layout_string.dat);
xasprintf(&out, "{\"V\":2,\"L\":%s}",
layout_string.dat);
} }
layout_string_free(&layout_string); layout_string_free(&layout_string);
return (out); return (out);
bad:
layout_string_free(&layout_string);
if (~flags & LAYOUT_CUSTOM_OLD_FORMAT)
return (NULL);
return (xstrdup("0000,"));
} }
/* Append information for a single cell in a JSON (v2) format. */ /* Append information for a single cell in a JSON (v2) format. */