updated for version 7.3.348

Problem:    "call range(1, 947948399)" causes a crash. (ZyX)
Solution:   Avoid a loop in the out of memory message.

diff --git a/src/misc2.c b/src/misc2.c
index 4c05a8cb85e67e03c018b5b955c98087119702b3..20ee1701b99cf6fce606f57abe95199b484d9de5 100644 (file)
--- 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 7c966e54b2a2f04884a5c59a7c3967eb96042b1f..9f5b06cc4c9ace0f163a5fcf16ec8136c6f5d19c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    348,
 /**/
     347,
 /**/