diff options
author | Bram Moolenaar <Bram@vim.org> | 2011-08-10 12:11:01 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2011-08-10 12:11:01 +0200 |
commit | 1cb7e0976da10d7c8b66372c1cb176f2e6b8423d (patch) | |
tree | d32b4049d2b514ba00436077272c7650d9a35ea7 | |
parent | ea35ef68889b03c7d026ee5cc5e9aadbbd1d54bb (diff) | |
download | vim-git-1cb7e0976da10d7c8b66372c1cb176f2e6b8423d.tar.gz |
updated for version 7.3.270v7.3.270
Problem: Illegal memory access.
Solution: Swap conditions. (Dominique Pelle)
-rw-r--r-- | src/ops.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -6311,7 +6311,7 @@ line_count_info(line, wc, cc, limit, eol_size) *wc += words; /* Add eol_size if the end of line was reached before hitting limit. */ - if (line[i] == NUL && i < limit) + if (i < limit && line[i] == NUL) { i += eol_size; chars += eol_size; diff --git a/src/version.c b/src/version.c index 0d97adec5..86addc57a 100644 --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 270, +/**/ 269, /**/ 268, |