diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-01-17 17:37:35 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-01-17 17:37:35 +0100 |
| commit | 7fbf9cab6aaab723c0860dbe1757764065afba91 (patch) | |
| tree | ad9227a4e5379f19818e08d166f38ff6ad63a686 | |
| parent | 3614f4c3b09f17f50b4948d4b46e723161f9f61b (diff) | |
| download | vim-7fbf9cab6aaab723c0860dbe1757764065afba91.tar.gz | |
Problem: Uninitialized variable. (Yasuhiro Matsumoto)
Solution: Set x2 to -1.
| -rw-r--r-- | src/option.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/option.c b/src/option.c index 8f524060..f38e9c70 100644 --- a/src/option.c +++ b/src/option.c @@ -6154,7 +6154,8 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf, { for (p = *varp; *p != NUL; ++p) { - int x2,x3 = -1; + int x2 = -1; + int x3 = -1; if (*p != NUL) p += mb_ptr2len(p); @@ -6165,8 +6166,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf, x3 = mb_ptr2char(p); p += mb_ptr2len(p); } - if (x2 != ':' || x2 == -1 || x3 == -1 - || (*p != NUL && *p != ',')) + if (x2 != ':' || x3 == -1 || (*p != NUL && *p != ',')) { errmsg = e_invarg; break; diff --git a/src/version.c b/src/version.c index 18fcd020..f071eb96 100644 --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 771, +/**/ 770, /**/ 769, |