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.
diff --git a/src/misc1.c b/src/misc1.c
index fb75e19..85ab727 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2067,13 +2067,17 @@
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;
}