diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_unix.c | 4 | ||||
| -rw-r--r-- | src/register.c | 4 | ||||
| -rw-r--r-- | src/term.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 90c5aed97d..7e7820934b 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1963,6 +1963,10 @@ get_x11_thing( retval = TRUE; if (!test_only) { + if (get_title) + vim_free(oldtitle); + else + vim_free(oldicon); if (text_prop.encoding == XA_STRING && !has_mbyte) { if (get_title) diff --git a/src/register.c b/src/register.c index a948bebda9..24e4b992a3 100644 --- a/src/register.c +++ b/src/register.c @@ -2872,9 +2872,9 @@ write_reg_contents_ex( p = vim_strnsave(str, (int)len); if (p == NULL) return; - if (must_append) + if (must_append && expr_line != NULL) { - s = concat_str(get_expr_line_src(), p); + s = concat_str(expr_line, p); vim_free(p); p = s; } diff --git a/src/term.c b/src/term.c index 57384f4d85..b0ab7c634a 100644 --- a/src/term.c +++ b/src/term.c @@ -2106,6 +2106,8 @@ tgetent_error(char_u *tbuf, char_u *term) { int i; + // Note: Valgrind may report a leak here, because the library keeps one + // buffer around that we can't ever free. i = TGETENT(tbuf, term); if (i < 0 // -1 is always an error # ifdef TGETENT_ZERO_ERR diff --git a/src/version.c b/src/version.c index 89896e5a1a..c03c3c02ab 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2406, +/**/ 2405, /**/ 2404, |