diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-10-26 11:41:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-10-26 11:41:00 +0200 |
| commit | 79739e163ba7f4b8fe1ad8374d24521b2e595331 (patch) | |
| tree | b144e97cc42ef4ac48024c83a27616375c42259f | |
| parent | b931d74b060461c47008aba7b3eb6a9ab1471c69 (diff) | |
updated for version 7.3.348v7.3.348
Problem: "call range(1, 947948399)" causes a crash. (ZyX)
Solution: Avoid a loop in the out of memory message.
| -rw-r--r-- | src/misc2.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/misc2.c b/src/misc2.c index 4c05a8cb85..20ee1701b9 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -1012,8 +1012,12 @@ do_outofmem_msg(size) { /* Don't hide this message */ emsg_silent = 0; - EMSGN(_("E342: Out of memory! (allocating %lu bytes)"), size); + + /* Must come first to avoid coming back here when printing the error + * message fails, e.g. when setting v:errmsg. */ did_outofmem_msg = TRUE; + + EMSGN(_("E342: Out of memory! (allocating %lu bytes)"), size); } } diff --git a/src/version.c b/src/version.c index 7c966e54b2..9f5b06cc4c 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 348, +/**/ 347, /**/ 346, |