From f56a6de10b5d2b5c3f38753fdae9d7fd82b58c73 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 7 Jul 2011 17:36:56 +0200 Subject: [PATCH] updated for version 7.3.243 Problem: Illegal memory access in readline(). Solution: Swap the conditions. (Dominique Pelle) --- src/eval.c | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/eval.c b/src/eval.c index e11170736..0ee5b7a0e 100644 --- a/src/eval.c +++ b/src/eval.c @@ -14318,7 +14318,7 @@ f_readfile(argvars, rettv) tolist = 0; for ( ; filtd < buflen || readlen <= 0; ++filtd) { - if (buf[filtd] == '\n' || readlen <= 0) + if (readlen <= 0 || buf[filtd] == '\n') { /* In binary mode add an empty list item when the last * non-empty line ends in a '\n'. */ diff --git a/src/version.c b/src/version.c index 4826a5154..ae75308e5 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 */ +/**/ + 243, /**/ 242, /**/ -- 2.50.1