mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-18 18:00:11 +00:00
Fix bootstrap infloop in GNU/Linux alpha
* src/emacs.c (main): Do not re-exec if EMACS_HEAP_EXEC is already set (Bug#32083).
This commit is contained in:
parent
48efd1c98b
commit
65889a6d12
1 changed files with 4 additions and 2 deletions
|
@ -707,10 +707,12 @@ main (int argc, char **argv)
|
||||||
bool disable_aslr = dumping;
|
bool disable_aslr = dumping;
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
if (disable_aslr && disable_address_randomization ())
|
if (disable_aslr && disable_address_randomization ()
|
||||||
|
&& !getenv ("EMACS_HEAP_EXEC"))
|
||||||
{
|
{
|
||||||
/* Set this so the personality will be reverted before execs
|
/* Set this so the personality will be reverted before execs
|
||||||
after this one. */
|
after this one, and to work around an re-exec loop on buggy
|
||||||
|
kernels (Bug#32083). */
|
||||||
xputenv ("EMACS_HEAP_EXEC=true");
|
xputenv ("EMACS_HEAP_EXEC=true");
|
||||||
|
|
||||||
/* Address randomization was enabled, but is now disabled.
|
/* Address randomization was enabled, but is now disabled.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue