diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-07-07 17:36:56 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-07-07 17:36:56 +0200 |
| commit | f56a6de10b5d2b5c3f38753fdae9d7fd82b58c73 (patch) | |
| tree | 4e8cdb00b46695a61a9e0fefd41abe9d00c17a1d | |
| parent | b5ce04dd281d2923693255a1f565d2170c2ca504 (diff) | |
updated for version 7.3.243v7.3.243
Problem: Illegal memory access in readline().
Solution: Swap the conditions. (Dominique Pelle)
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index e111707365..0ee5b7a0e9 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 4826a51544..ae75308e51 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 */ /**/ + 243, +/**/ 242, /**/ 241, |