1
0
forked from aniani/vim

patch 9.1.1270: missing out-of-memory checks in buffer.c

Problem:  missing out-of-memory checks in buffer.c
Solution: handle out-of-memory situations during allocation
          (John Marriott)

closes: #17031

Signed-off-by: John Marriott <basilisk@internode.on.net>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
John Marriott
2025-04-02 20:32:35 +02:00
committed by Christian Brabandt
parent 8293574c8b
commit 7fb90815a0
2 changed files with 35 additions and 21 deletions

View File

@@ -2926,6 +2926,8 @@ ExpandBufnames(
p = home_replace_save(buf, p); p = home_replace_save(buf, p);
else else
p = vim_strsave(p); p = vim_strsave(p);
if (p == NULL)
return FAIL;
if (!fuzzy) if (!fuzzy)
{ {
@@ -4030,8 +4032,11 @@ maketitle(void)
else else
{ {
p = transstr(gettail(curbuf->b_fname)); p = transstr(gettail(curbuf->b_fname));
vim_strncpy(buf, p, SPACE_FOR_FNAME); if (p != NULL)
vim_free(p); {
vim_strncpy(buf, p, SPACE_FOR_FNAME);
vim_free(p);
}
} }
#ifdef FEAT_TERMINAL #ifdef FEAT_TERMINAL
@@ -4084,8 +4089,11 @@ maketitle(void)
if (off < SPACE_FOR_DIR) if (off < SPACE_FOR_DIR)
{ {
p = transstr(buf + off); p = transstr(buf + off);
vim_strncpy(buf + off, p, (size_t)(SPACE_FOR_DIR - off)); if (p != NULL)
vim_free(p); {
vim_strncpy(buf + off, p, (size_t)(SPACE_FOR_DIR - off));
vim_free(p);
}
} }
else else
{ {
@@ -4767,25 +4775,29 @@ build_stl_str_hl(
size_t new_fmt_len = parsed_usefmt size_t new_fmt_len = parsed_usefmt
+ str_length + fmt_length + 3; + str_length + fmt_length + 3;
char_u *new_fmt = (char_u *)alloc(new_fmt_len * sizeof(char_u)); char_u *new_fmt = (char_u *)alloc(new_fmt_len * sizeof(char_u));
char_u *new_fmt_p = new_fmt;
new_fmt_p = (char_u *)memcpy(new_fmt_p, usefmt, parsed_usefmt) if (new_fmt != NULL)
+ parsed_usefmt; {
new_fmt_p = (char_u *)memcpy(new_fmt_p , str, str_length) char_u *new_fmt_p = new_fmt;
+ str_length;
new_fmt_p = (char_u *)memcpy(new_fmt_p, "%}", 2) + 2;
new_fmt_p = (char_u *)memcpy(new_fmt_p , s, fmt_length)
+ fmt_length;
*new_fmt_p = 0;
new_fmt_p = NULL;
if (usefmt != fmt) new_fmt_p = (char_u *)memcpy(new_fmt_p, usefmt, parsed_usefmt)
vim_free(usefmt); + parsed_usefmt;
VIM_CLEAR(str); new_fmt_p = (char_u *)memcpy(new_fmt_p , str, str_length)
usefmt = new_fmt; + str_length;
s = usefmt + parsed_usefmt; new_fmt_p = (char_u *)memcpy(new_fmt_p, "%}", 2) + 2;
evaldepth++; new_fmt_p = (char_u *)memcpy(new_fmt_p , s, fmt_length)
continue; + fmt_length;
*new_fmt_p = 0;
new_fmt_p = NULL;
if (usefmt != fmt)
vim_free(usefmt);
VIM_CLEAR(str);
usefmt = new_fmt;
s = usefmt + parsed_usefmt;
evaldepth++;
continue;
}
} }
#endif #endif
break; break;

View File

@@ -704,6 +704,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 */
/**/
1270,
/**/ /**/
1269, 1269,
/**/ /**/