Mercurial > vim
diff src/misc1.c @ 19181:94eda51ba9ba v8.2.0149
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Commit: https://github.com/vim/vim/commit/8a7d6542b33e5d2b352262305c3bfdb2d14e1cf8
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 26 15:56:19 2020 +0100
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Problem: Maintaining a Vim9 branch separately is more work.
Solution: Merge the Vim9 script changes.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 26 Jan 2020 16:00:05 +0100 |
parents | 80b40bd5ec1a |
children | 9dc843109c97 |
line wrap: on
line diff
--- a/src/misc1.c +++ b/src/misc1.c @@ -2067,13 +2067,17 @@ match_user(char_u *name) concat_str(char_u *str1, char_u *str2) { char_u *dest; - size_t l = STRLEN(str1); + size_t l = str1 == NULL ? 0 : STRLEN(str1); - dest = alloc(l + STRLEN(str2) + 1L); + dest = alloc(l + (str2 == NULL ? 0 : STRLEN(str2)) + 1L); if (dest != NULL) { - STRCPY(dest, str1); - STRCPY(dest + l, str2); + if (str1 == NULL) + *dest = NUL; + else + STRCPY(dest, str1); + if (str2 != NULL) + STRCPY(dest + l, str2); } return dest; }