updated for version 7.3.270

Problem:    Illegal memory access.
Solution:   Swap conditions. (Dominique Pelle)

diff --git a/src/ops.c b/src/ops.c
index bdc53de33ba368df4459f03c5b87dd83b51acc37..41193566dbb5e5ebcc416dca260c81e7d05c22b1 100644 (file)
--- 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 0d97adec54743a28c25b67069579100440489896..86addc57ab1309b0b379fbbd09f949a9d9054a12 100644 (file)
--- 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,
 /**/