patch 9.1.1316: missing memory allocation failure in os_mswin.c
Problem: missing memory allocation failure in os_mswin.c
Solution: check for memory allocation failure and return early.
(John Marriott)
closes: #17134
Signed-off-by: John Marriott <basilisk@internode.on.net>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
cfe502c575
commit
7ddba51635
@ -2307,16 +2307,20 @@ findServer(char_u *name)
|
|||||||
void
|
void
|
||||||
serverSetName(char_u *name)
|
serverSetName(char_u *name)
|
||||||
{
|
{
|
||||||
|
size_t namelen;
|
||||||
char_u *ok_name;
|
char_u *ok_name;
|
||||||
HWND hwnd = 0;
|
HWND hwnd = 0;
|
||||||
int i = 0;
|
int i = 0;
|
||||||
char_u *p;
|
char_u *p;
|
||||||
|
|
||||||
// Leave enough space for a 9-digit suffix to ensure uniqueness!
|
// Leave enough space for a 9-digit suffix to ensure uniqueness!
|
||||||
ok_name = alloc(STRLEN(name) + 10);
|
namelen = STRLEN(name);
|
||||||
|
ok_name = alloc(namelen + 10);
|
||||||
|
if (ok_name == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
STRCPY(ok_name, name);
|
STRCPY(ok_name, name);
|
||||||
p = ok_name + STRLEN(name);
|
p = ok_name + namelen;
|
||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
/* os_mswin.c */
|
/* os_mswin.c */
|
||||||
|
void SaveInst(HINSTANCE hInst);
|
||||||
void mch_exit_g(int r);
|
void mch_exit_g(int r);
|
||||||
void mch_early_init(void);
|
void mch_early_init(void);
|
||||||
int mch_input_isatty(void);
|
int mch_input_isatty(void);
|
||||||
|
|||||||
@ -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 */
|
||||||
|
/**/
|
||||||
|
1316,
|
||||||
/**/
|
/**/
|
||||||
1315,
|
1315,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user