Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2025-08-22 12:01:08 +01:00
2 changed files with 4 additions and 2 deletions

View File

@ -248,8 +248,8 @@ cmd_capture_pane_exec(struct cmd *self, struct cmdq_item *item)
}
file_print_buffer(c, buf, len);
file_print(c, "\n");
free(buf);
}
free(buf);
} else {
bufname = NULL;
if (args_has(args, 'b'))

View File

@ -4930,7 +4930,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
struct window_pane *wp = ft->wp;
const char *errstr, *copy, *cp, *cp2;
const char *marker = NULL;
const char *time_format = NULL;
char *time_format = NULL;
char *copy0, *condition, *found, *new;
char *value, *left, *right;
size_t valuelen;
@ -5465,6 +5465,7 @@ done:
free(sub);
format_free_modifiers(list, count);
free(copy0);
free(time_format);
return (0);
fail:
@ -5473,6 +5474,7 @@ fail:
free(sub);
format_free_modifiers(list, count);
free(copy0);
free(time_format);
return (-1);
}