From 1cb7e0976da10d7c8b66372c1cb176f2e6b8423d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 10 Aug 2011 12:11:01 +0200 Subject: [PATCH] updated for version 7.3.270 Problem: Illegal memory access. Solution: Swap conditions. (Dominique Pelle) --- src/ops.c | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ops.c b/src/ops.c index bdc53de33b..41193566db 100644 --- a/src/ops.c +++ b/src/ops.c @@ -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 0d97adec54..86addc57ab 100644 --- a/src/version.c +++ b/src/version.c @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 270, /**/ 269, /**/