From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 28 Oct 2017 14:07:33 +0000 (+0200)
Subject: patch 8.0.1230: CTRL-A in Visual mode uses character after selection
X-Git-Tag: v8.0.1230
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce1577502693940f1f9285cd803a075b738a2330;p=vim

patch 8.0.1230: CTRL-A in Visual mode uses character after selection

Problem:    CTRL-A in Visual mode uses character after selection. (Nikolai
            Pavlov)
Solution:   Check the length before using a character.
---

diff --git a/src/charset.c b/src/charset.c
index a8b704c69..003949f0a 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1852,7 +1852,7 @@ vim_isblankline(char_u *lbuf)
  * If "what" contains STR2NR_OCT recognize octal numbers
  * If "what" contains STR2NR_HEX recognize hex numbers
  * If "what" contains STR2NR_FORCE always assume bin/oct/hex.
- * If maxlen > 0, check at a maximum maxlen chars
+ * If maxlen > 0, check at a maximum maxlen chars.
  */
     void
 vim_str2nr(
@@ -1900,7 +1900,7 @@ vim_str2nr(
 	    if (what & STR2NR_OCT)
 	    {
 		/* Don't interpret "0", "08" or "0129" as octal. */
-		for (n = 1; VIM_ISDIGIT(ptr[n]); ++n)
+		for (n = 1; n != maxlen && VIM_ISDIGIT(ptr[n]); ++n)
 		{
 		    if (ptr[n] > '7')
 		    {
@@ -1908,8 +1908,6 @@ vim_str2nr(
 			break;
 		    }
 		    pre = '0';	/* assume octal */
-		    if (n == maxlen)
-			break;
 		}
 	    }
 	}
diff --git a/src/version.c b/src/version.c
index 1da082d1f..221c7576a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1230,
 /**/
     1229,
 /**/