1
0
forked from aniani/vim

patch 8.1.1895: using NULL pointer when out of memory

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

View File

@@ -181,14 +181,19 @@ open_buffer(
if (curbuf->b_ml.ml_mfp != NULL) if (curbuf->b_ml.ml_mfp != NULL)
break; break;
/* /*
* if there is no memfile at all, exit * If there is no memfile at all, exit.
* This is OK, since there are no changes to lose. * This is OK, since there are no changes to lose.
*/ */
if (curbuf == NULL) if (curbuf == NULL)
{ {
emsg(_("E82: Cannot allocate any buffer, exiting...")); emsg(_("E82: Cannot allocate any buffer, exiting..."));
// Don't try to do any saving, with "curbuf" NULL almost nothing
// will work.
v_dying = 2;
getout(2); getout(2);
} }
emsg(_("E83: Cannot allocate buffer, using other one...")); emsg(_("E83: Cannot allocate buffer, using other one..."));
enter_buffer(curbuf); enter_buffer(curbuf);
#ifdef FEAT_SYN_HL #ifdef FEAT_SYN_HL

View File

@@ -3016,6 +3016,7 @@ syn_check_group(char_u *pp, int len)
syn_add_group(char_u *name) syn_add_group(char_u *name)
{ {
char_u *p; char_u *p;
char_u *name_up;
// Check that the name is ASCII letters, digits and underscore. // Check that the name is ASCII letters, digits and underscore.
for (p = name; *p != NUL; ++p) for (p = name; *p != NUL; ++p)
@@ -3061,9 +3062,16 @@ syn_add_group(char_u *name)
return 0; 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)); 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 = 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) #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_bg = INVALCOLOR;
HL_TABLE()[highlight_ga.ga_len].sg_gui_fg = INVALCOLOR; HL_TABLE()[highlight_ga.ga_len].sg_gui_fg = INVALCOLOR;

View File

@@ -2588,6 +2588,8 @@ msg_puts_printf(char_u *str, int maxlen)
int n = (int)(s - p); int n = (int)(s - p);
buf = alloc(n + 3); buf = alloc(n + 3);
if (buf != NULL)
{
memcpy(buf, p, n); memcpy(buf, p, n);
if (!info_message) if (!info_message)
buf[n++] = CAR; buf[n++] = CAR;
@@ -2598,6 +2600,7 @@ msg_puts_printf(char_u *str, int maxlen)
else else
mch_errmsg((char *)buf); mch_errmsg((char *)buf);
vim_free(buf); vim_free(buf);
}
p = s + 1; p = s + 1;
} }
} }

View File

@@ -4556,6 +4556,11 @@ do_join(
/* allocate the space for the new line */ /* allocate the space for the new line */
newp = alloc(sumsize + 1); newp = alloc(sumsize + 1);
if (newp == NULL)
{
ret = FAIL;
goto theend;
}
cend = newp + sumsize; cend = newp + sumsize;
*cend = 0; *cend = 0;

View File

@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1895,
/**/ /**/
1894, 1894,
/**/ /**/