thac0/vim
1
0
Fork 0
forked from aniani/vim
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

10
src/highlight.c
View File

@@ -3016,6 +3016,7 @@ syn_check_group(char_u *pp, int len)
syn_add_group(char_u *name)
{
char_u *p;
char_u *name_up;
// Check that the name is ASCII letters, digits and underscore.
for (p = name; *p != NUL; ++p)
@@ -3061,9 +3062,16 @@ syn_add_group(char_u *name)
return 0;
}
name_up = vim_strsave_up(name);
if (name_up == NULL)
{
vim_free(name);
return 0;
}
vim_memset(&(HL_TABLE()[highlight_ga.ga_len]), 0, sizeof(hl_group_T));
HL_TABLE()[highlight_ga.ga_len].sg_name = name;
HL_TABLE()[highlight_ga.ga_len].sg_name_u = vim_strsave_up(name);
HL_TABLE()[highlight_ga.ga_len].sg_name_u = name_up;
#if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)
HL_TABLE()[highlight_ga.ga_len].sg_gui_bg = INVALCOLOR;
HL_TABLE()[highlight_ga.ga_len].sg_gui_fg = INVALCOLOR;