circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 10:08:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-03-13 20:02:36 +00:00
commit 786f5e505e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
format.c
View File

@ -1272,6 +1272,7 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
/* Make a copy of the key. */
copy = copy0 = xstrndup(key, keylen);
log_debug("%s: format = '%s'", __func__, copy);
/* Process modifier list. */
list = format_build_modifiers(ft, &copy, &count);
@ -1338,7 +1339,6 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
cmp = fm;
}
}
log_debug("%s: remaining = '%s'", __func__, copy);
/* Is this a literal string? */
if (modifiers & FORMAT_LITERAL) {
@ -1468,6 +1468,7 @@ done:
}
/* Expand the buffer and copy in the value. */
log_debug("%s: '%s' -> '%s'", __func__, copy0, value);
valuelen = strlen(value);
while (*len - *off < valuelen + 1) {
*buf = xreallocarray(*buf, 2, *len);