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
commit738f4e913a6779c057ddeba4a120496b77f2c2d9 (patch)
tree57666eb597062cf655e81f8dd83c56b33a2d29ab
parent77164238d81256b55641d7c89d77c977cce6b9c3 (diff)
downloadvim-738f4e913a6779c057ddeba4a120496b77f2c2d9.tar.gz
updated for version 7.4.390v7.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 3a834aa0..2c28aae8 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 d5aaa905..d2de43f7 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,