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 | 07137b037eb224a2031018c1b2edc6014c43d6a6 (patch) | |
| tree | 292f0e053703717606c0a9e3495273251323b8c1 /src | |
| parent | c13e4326cdaa0541bfa6186a28d25f462755fe95 (diff) | |
| download | vim-07137b037eb224a2031018c1b2edc6014c43d6a6.tar.gz | |
Problem: "call range(1, 947948399)" causes a crash. (ZyX)
Solution: Avoid a loop in the out of memory message.
Diffstat (limited to 'src')
| -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 4c05a8cb..20ee1701 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 7c966e54..9f5b06cc 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, |