aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2018-07-08 09:04:02 -0700
committerPaul Eggert2018-07-08 09:04:51 -0700
commit65889a6d127fcbbbdc1e74d26036e91bd24d1405 (patch)
treeac6c9c7aec8cfa00469b612e1e099309cfa57e31 /src
parent48efd1c98b3d4714860e4bf355c6af57c6cee827 (diff)
downloademacs-65889a6d127fcbbbdc1e74d26036e91bd24d1405.tar.gz
emacs-65889a6d127fcbbbdc1e74d26036e91bd24d1405.zip
Fix bootstrap infloop in GNU/Linux alpha
* src/emacs.c (main): Do not re-exec if EMACS_HEAP_EXEC is already set (Bug#32083).
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 017c62308c1..f5e47428ef9 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -707,10 +707,12 @@ main (int argc, char **argv)
707 bool disable_aslr = dumping; 707 bool disable_aslr = dumping;
708# endif 708# endif
709 709
710 if (disable_aslr && disable_address_randomization ()) 710 if (disable_aslr && disable_address_randomization ()
711 && !getenv ("EMACS_HEAP_EXEC"))
711 { 712 {
712 /* Set this so the personality will be reverted before execs 713 /* Set this so the personality will be reverted before execs
713 after this one. */ 714 after this one, and to work around an re-exec loop on buggy
715 kernels (Bug#32083). */
714 xputenv ("EMACS_HEAP_EXEC=true"); 716 xputenv ("EMACS_HEAP_EXEC=true");
715 717
716 /* Address randomization was enabled, but is now disabled. 718 /* Address randomization was enabled, but is now disabled.