diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2018-07-09 20:03:30 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-07-09 20:03:30 -0400 |
| commit | 7bcb697e198cb314980b93862a79e892009088c4 (patch) | |
| tree | 17f30ba3b4aa4f1e4e31dde58139a5ec0ae82080 /src | |
| parent | 3307353e13a9226d477c9b1a39baae76584b90b9 (diff) | |
| parent | 65889a6d127fcbbbdc1e74d26036e91bd24d1405 (diff) | |
| download | emacs-7bcb697e198cb314980b93862a79e892009088c4.tar.gz | |
Merge from emacs-26
65889a6d12 Fix bootstrap infloop in GNU/Linux alpha
48efd1c98b Minor fix of a recent documentation change
3302b7cd7f Mention the NSM in the gnutls variable doc strings
40c2ce743b Remove test code from last commit
e02d8e29c6 Fix Bug#32084
da5d6dbe39 Fix (length NON-SEQUENCE) documentation
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c index 8633e934e51..861d70735ca 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -712,10 +712,12 @@ main (int argc, char **argv) bool disable_aslr = dumping; # 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 - after this one. */ + after this one, and to work around an re-exec loop on buggy + kernels (Bug#32083). */ xputenv ("EMACS_HEAP_EXEC=true"); /* Address randomization was enabled, but is now disabled. |