changeset 12702:a99da335b6f1 v8.0.1229

patch 8.0.1229: condition in vim_str2nr() is always true commit https://github.com/vim/vim/commit/9a91c7a1f9134f799b8672a4e3844781263e8cf3 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 28 15:38:40 2017 +0200 patch 8.0.1229: condition in vim_str2nr() is always true Problem: Condition in vim_str2nr() is always true. (Nikolai Pavlov) Solution: Remove the condition. (Closes https://github.com/vim/vim/issues/2259)
author Christian Brabandt <cb@256bit.org>
date Sat, 28 Oct 2017 15:45:04 +0200
parents 61b0d9161417
children ec26e8e8b1a9
files src/charset.c src/version.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/charset.c
+++ b/src/charset.c
@@ -1907,8 +1907,7 @@ vim_str2nr(
 			pre = 0;	/* can't be octal */
 			break;
 		    }
-		    if (ptr[n] >= '0')
-			pre = '0';	/* assume octal */
+		    pre = '0';	/* assume octal */
 		    if (n == maxlen)
 			break;
 		}
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1229,
+/**/
     1228,
 /**/
     1227,