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 | 995c8678657b597e889b841a49188eca42216b23 (patch) | |
tree | 03d929a28fe112e6a867e9d66458420874aa214d | |
parent | aaf8bbf140a1648db65d829a4f31a399e59023ce (diff) | |
download | vim-995c8678657b597e889b841a49188eca42216b23.tar.gz |
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 0d97adec..86addc57 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, |