procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid segfaults on MS-Windows in enexec'ed Emacs

Browse source 
* src/emacs.c (main) [WINDOWSNT]: Fix logic of using dynamic
heap in unexec case.  (Bug#34277)
This commit is contained in:
Eli Zaretskii 2019-02-07 17:23:57 +02:00
parent 3d6d8d795b
commit 005d8346b8
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/emacs.c
View file

@ -914,17 +914,23 @@ main (int argc, char **argv)
happens. This relies on the static heap being needed only in
temacs and only if we are going to dump with unexec. */
bool use_dynamic_heap = false;
char *temacs_str = strstr (argv[0], "temacs");
if (temacs
&& temacs_str != NULL
&& (temacs_str == argv[0] || IS_DIRECTORY_SEP (temacs_str[-1])))
if (temacs)
{
/* Note that gflags are set at this point only if we have been
called with the --temacs=METHOD option. We assume here that
temacs is always called that way, otherwise the functions
that rely on gflags, like will_dump_with_pdumper_p below,
will not do their job. */
use_dynamic_heap = will_dump_with_pdumper_p ();
char *temacs_str = NULL, *p;
for (p = argv[0]; (p = strstr (p, "temacs")) != NULL; p++)
temacs_str = p;
if (temacs_str != NULL
&& (temacs_str == argv[0] || IS_DIRECTORY_SEP (temacs_str[-1])))
{
/* Note that gflags are set at this point only if we have been
called with the --temacs=METHOD option. We assume here that
temacs is always called that way, otherwise the functions
that rely on gflags, like will_dump_with_pdumper_p below,
will not do their job. */
use_dynamic_heap = will_dump_with_pdumper_p ();
}
else
use_dynamic_heap = true;
}
else
use_dynamic_heap = true;