aboutsummaryrefslogtreecommitdiff
path: root/format.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2018-08-27 13:02:38 +0100
committerThomas Adam <thomas@xteddy.org>2018-08-27 13:02:38 +0100
commit18b611bc8d971f466524efbc755cc22238d63db4 (patch)
treefaec5f736325b6f7be9564a7453d79733657ad74 /format.c
parent79a9472dbc3a0c2c635f9761909c6184c53d3a17 (diff)
parent79d2351ce8acbd579081e558cdbaebe333e10153 (diff)
downloadrtmux-18b611bc8d971f466524efbc755cc22238d63db4.tar.gz
rtmux-18b611bc8d971f466524efbc755cc22238d63db4.tar.bz2
rtmux-18b611bc8d971f466524efbc755cc22238d63db4.zip
Merge branch 'obsd-master'
Diffstat (limited to 'format.c')
-rw-r--r--format.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/format.c b/format.c
index bb324d56..96c7efb3 100644
--- a/format.c
+++ b/format.c
@@ -1102,8 +1102,10 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
found = xstrdup("");
}
}
- if (format_choose(ptr + 1, &left, &right) != 0)
+ if (format_choose(ptr + 1, &left, &right) != 0) {
+ free(found);
goto fail;
+ }
if (format_true(found))
value = format_expand(ft, left);