summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/misc1.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/misc1.c b/src/misc1.c
index 958163178..11f456b80 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -10887,7 +10887,14 @@ get_cmd_output(cmd, infile, flags)
buffer = NULL;
}
else
+ {
+ /* Change NUL into SOH, otherwise the string is truncated. */
+ for (i = 0; i < len; ++i)
+ if (buffer[len] == NUL)
+ buffer[len] = 1;
+
buffer[len] = NUL; /* make sure the buffer is terminated */
+ }
done:
vim_free(tempname);
diff --git a/src/version.c b/src/version.c
index 676245d7b..bf7c0e194 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 12,
+/**/
11,
/**/
10,