From 8a7d6542b33e5d2b352262305c3bfdb2d14e1cf8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 26 Jan 2020 15:56:19 +0100 Subject: 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. --- src/misc1.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/misc1.c') diff --git a/src/misc1.c b/src/misc1.c index fb75e1930..85ab727d3 100644 --- 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; } -- cgit v1.2.1