diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-08-20 22:58:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-08-20 22:58:37 +0200 |
| commit | 6f10c70b59fa4e56aa479345fb0caeaac7429bfb (patch) | |
| tree | cdbb54c3b73a4607d8bdebb116c962bb044246f5 /src/highlight.c | |
| parent | 1058c9d9b5815467182d487f10f6dd71385cb796 (diff) | |
patch 8.1.1895: using NULL pointer when out of memoryv8.1.1895
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)
Diffstat (limited to 'src/highlight.c')
| -rw-r--r-- | src/highlight.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/highlight.c b/src/highlight.c index db65ffca71..f32081d8ab 100644 --- a/src/highlight.c +++ b/src/highlight.c @@ -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; |