summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2014-09-19 20:45:23 +0200
committerBram Moolenaar <bram@vim.org>2014-09-19 20:45:23 +0200
commitf4573ef8349fad632ea6a245751c4e1584974d14 (patch)
treed06d507a6cd3c9b86a36d068c23e1996b9a2febe
parent06724831d241b8a3e049fae30cc6a8c7fd89373f (diff)
downloadvim-f4573ef8349fad632ea6a245751c4e1584974d14.tar.gz
updated for version 7.4.451v7.4.451v7-4-451
Problem: Calling system() with empty input gives an error for writing the temp file. Solution: Do not try writing if the string length is zero. (Olaf Dabrunz)
-rw-r--r--src/eval.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 780d8834..8f62cb2e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -18638,13 +18638,16 @@ get_cmd_output_as_rettv(argvars, rettv, retlist)
}
else
{
+ size_t len;
+
p = get_tv_string_buf_chk(&argvars[1], buf);
if (p == NULL)
{
fclose(fd);
goto errret; /* type error; errmsg already given */
}
- if (fwrite(p, STRLEN(p), 1, fd) != 1)
+ len = STRLEN(p);
+ if (len > 0 && fwrite(p, len, 1, fd) != 1)
err = TRUE;
}
if (fclose(fd) != 0)
diff --git a/src/version.c b/src/version.c
index a6a10176..fa2ced9b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 451,
+/**/
450,
/**/
449,