Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2018-08-27 13:02:38 +01:00
4 changed files with 17 additions and 5 deletions

View File

@ -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);