Permalink
Browse files

patch 8.0.0305: invalid memory access when option has duplicate flag

Problem:    Invalid memory access when option has duplicate flag.
Solution:   Correct pointer computation. (Dominique Pelle, closes #1442)
  • Loading branch information...
brammool committed Feb 5, 2017
1 parent 1fb0d49 commit aaaf57d8a936efe420190c077e4a74041cc6c72e
Showing with 12 additions and 3 deletions.
  1. +4 −3 src/option.c
  2. +6 −0 src/testdir/test_options.vim
  3. +2 −0 src/version.c
View
@@ -4954,7 +4954,7 @@ do_set(
if (flags & P_FLAGLIST)
{
/* Remove flags that appear twice. */
- for (s = newval; *s; ++s)
+ for (s = newval; *s;)
{
/* if options have P_FLAGLIST and
* P_ONECOMMA such as 'whichwrap' */
@@ -4966,7 +4966,7 @@ do_set(
/* Remove the duplicated value and
* the next comma. */
STRMOVE(s, s + 2);
- s -= 2;
+ continue;
}
}
else
@@ -4975,9 +4975,10 @@ do_set(
&& vim_strchr(s + 1, *s) != NULL)
{
STRMOVE(s, s + 1);
- --s;
+ continue;
}
}
+ ++s;
}
}
@@ -13,6 +13,12 @@ function! Test_whichwrap()
set whichwrap+=h,l
call assert_equal('b,s,h,l', &whichwrap)
+ set whichwrap=h,h
+ call assert_equal('h', &whichwrap)
+
+ set whichwrap=h,h,h
+ call assert_equal('h', &whichwrap)
+
set whichwrap&
endfunction
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 305,
/**/
304,
/**/

0 comments on commit aaaf57d

Please sign in to comment.