changeset 2996:b9182da84c7e v7.3.270

updated for version 7.3.270 Problem: Illegal memory access. Solution: Swap conditions. (Dominique Pelle)
author Bram Moolenaar <bram@vim.org>
date Wed, 10 Aug 2011 12:11:01 +0200
parents d53f6e5e57f3
children 1a2f0ba8407d
files src/ops.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ops.c
+++ b/src/ops.c
@@ -6311,7 +6311,7 @@ line_count_info(line, wc, cc, limit, eol
     *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;
--- 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,