summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-08-06 12:49:18 +0200
committerBram Moolenaar <Bram@vim.org>2014-08-06 12:49:18 +0200
commitece29e80131afdd4bb7aa74f62b98cf97f1090b5 (patch)
tree6eab07277d84cfc836c40efcef1025e599e25bd3
parent4e067c898ef1f4a34cd70ddf3de3a1e60ac23c84 (diff)
downloadvim-git-ece29e80131afdd4bb7aa74f62b98cf97f1090b5.tar.gz
updated for version 7.4.390v7.4.390
Problem: Advancing pointer over end of a string. Solution: Init quote character to -1 instead of zero. (Dominique Pelle)
-rw-r--r--src/misc1.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/misc1.c b/src/misc1.c
index 3a834aa0c..2c28aae84 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -5503,7 +5503,7 @@ cin_has_js_key(text)
char_u *text;
{
char_u *s = skipwhite(text);
- int quote = 0;
+ int quote = -1;
if (*s == '\'' || *s == '"')
{
diff --git a/src/version.c b/src/version.c
index d5aaa9050..d2de43f7a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 390,
+/**/
389,
/**/
388,