aboutsummaryrefslogtreecommitdiff
path: root/format.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2014-11-09 00:15:51 +0000
committerThomas Adam <thomas@xteddy.org>2014-11-09 00:15:51 +0000
commitfc05bf255af2a39a8168320455f79e7e6d9e915a (patch)
tree513fd3ba523bb758a8977f12618f667ad3a5247d /format.c
parent747cab428158eada08a87a2c0e1ac917ba3293e1 (diff)
parent8f1302282b02f07e0868fbcdb79bb5404010ad4e (diff)
downloadrtmux-fc05bf255af2a39a8168320455f79e7e6d9e915a.tar.gz
rtmux-fc05bf255af2a39a8168320455f79e7e6d9e915a.tar.bz2
rtmux-fc05bf255af2a39a8168320455f79e7e6d9e915a.zip
Merge branch 'obsd-master'
Diffstat (limited to 'format.c')
-rw-r--r--format.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/format.c b/format.c
index eb87a5ba..e7fd3e1f 100644
--- a/format.c
+++ b/format.c
@@ -237,7 +237,8 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
*ptr = '\0';
value = format_find(ft, copy + 1);
- if (value != NULL && (value[0] != '0' || value[1] != '\0')) {
+ if (value != NULL && *value != '\0' &&
+ (value[0] != '0' || value[1] != '\0')) {
value = ptr + 1;
ptr = strchr(value, ',');
if (ptr == NULL)