diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-05-18 18:34:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-05-18 18:34:19 +0200 |
| commit | 455981e69bcef65ef96ecf6b0a27810b585fc9d9 (patch) | |
| tree | 2ffbd519693e8e35fd7a1c24841d412ba6a37211 | |
| parent | f9de140e7f45f4f79123519cb69c385e8e88105b (diff) | |
| download | vim-git-455981e69bcef65ef96ecf6b0a27810b585fc9d9.tar.gz | |
updated for version 7.3.522v7.3.522
Problem: Crash in vim_realloc() when using MEM_PROFILE.
Solution: Avoid using a NULL argument. (Dominique Pelle)
| -rw-r--r-- | src/eval.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 9a81b4f22..07cb87f99 100644 --- 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 dd6700dae..0c866c5ec 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 */ /**/ + 522, +/**/ 521, /**/ 520, |