aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.1.1895: using NULL pointer when out of memory

Browse Source 
Problem:    Using NULL pointer when out of memory.
Solution:   Bail out or skip the code using the pointer. (Zu-Ming Jiang,
            closes #4805, closes #4843, closes #4939, closes #4844)
This commit is contained in:
Bram Moolenaar
2019-08-20 22:58:37 +02:00
parent 1058c9d9b5
commit 6f10c70b59
5 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/message.c
View File

@@ -2588,16 +2588,19 @@ msg_puts_printf(char_u *str, int maxlen)
int n = (int)(s - p);
buf = alloc(n + 3);
memcpy(buf, p, n);
if (!info_message)
buf[n++] = CAR;
buf[n++] = NL;
buf[n++] = NUL;
if (info_message) // informative message, not an error
mch_msg((char *)buf);
else
mch_errmsg((char *)buf);
vim_free(buf);
if (buf != NULL)
{
memcpy(buf, p, n);
if (!info_message)
buf[n++] = CAR;
buf[n++] = NL;
buf[n++] = NUL;
if (info_message) // informative message, not an error
mch_msg((char *)buf);
else
mch_errmsg((char *)buf);
vim_free(buf);
}
p = s + 1;
}
}