thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.2.3673: crash when allocating signal stack fails

Browse Source 
Problem:    Crash when allocating signal stack fails.
Solution:   Only using sourcing info when available. (closes #9215)
This commit is contained in:
Bram Moolenaar 2021-11-25 13:39:28 +00:00
parent 71b36206be
commit 0bd8d05638
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/globals.h
View File

@ -288,6 +288,7 @@ EXTERN int msg_no_more INIT(= FALSE); // don't use more prompt, truncate
* Current context is at ga_len - 1.
*/
EXTERN garray_T exestack INIT5(0, 0, sizeof(estack_T), 50, NULL);
#define HAVE_SOURCING_INFO (exestack.ga_data != NULL && exestack.ga_len > 0)
// name of error message source
#define SOURCING_NAME (((estack_T *)exestack.ga_data)[exestack.ga_len - 1].es_name)
// line number in the message source or zero

4
src/message.c
View File

@ -446,7 +446,7 @@ reset_last_sourcing(void)
static int
other_sourcing_name(void)
{
if (SOURCING_NAME != NULL)
if (HAVE_SOURCING_INFO && SOURCING_NAME != NULL)
{
if (last_sourcing_name != NULL)
return STRCMP(SOURCING_NAME, last_sourcing_name) != 0;
@ -465,7 +465,7 @@ get_emsg_source(void)
{
char_u *Buf, *p;
if (SOURCING_NAME != NULL && other_sourcing_name())
if (HAVE_SOURCING_INFO && SOURCING_NAME != NULL && other_sourcing_name())
{
char_u *sname = estack_sfile(ESTACK_NONE);
char_u *tofree = sname;

2
src/version.c
View File

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