updated for version 7.3.522

Problem:    Crash in vim_realloc() when using MEM_PROFILE.
Solution:   Avoid using a NULL argument. (Dominique Pelle)

diff --git a/src/eval.c b/src/eval.c
index 9a81b4f22b412d2618ab1f26791db03b16e8639c..07cb87f998d4e4b7945289f9c56b02fa32292864 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -14643,7 +14643,9 @@ f_readfile(argvars, rettv)
                    long growmin  = (long)((p - start) * 2 + prevlen);
                    prevsize = grow50pc > growmin ? grow50pc : growmin;
                }
-               if ((newprev = vim_realloc(prev, prevsize)) == NULL)
+               newprev = prev == NULL ? alloc(prevsize)
+                                               : vim_realloc(prev, prevsize);
+               if (newprev == NULL)
                {
                    do_outofmem_msg((long_u)prevsize);
                    failed = TRUE;

diff --git a/src/version.c b/src/version.c
index dd6700dae50b3c1c910db2c333da5391246dbead..0c866c5ec56a2c916b22a848121895e1bb733788 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 */
+/**/
+    522,
 /**/
     521,
 /**/