diff options
| author | Paul Eggert | 2015-03-05 11:58:56 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-03-05 11:59:31 -0800 |
| commit | cbc9d8d4269f2cca7950060b5e37747b27dac1de (patch) | |
| tree | e0f7972d767e10f86e56cb68f1c029837df6efaa /src | |
| parent | 1be3bd0ad86644e091ba655a6b8d592c395701ad (diff) | |
| download | emacs-cbc9d8d4269f2cca7950060b5e37747b27dac1de.tar.gz emacs-cbc9d8d4269f2cca7950060b5e37747b27dac1de.zip | |
Work around x86 glibc backtrace bug
* sysdep.c (emacs_backtrace): Don't dump core on x86.
Fixes: bug#19959
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/sysdep.c | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ae827cb4416..6b658f51671 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2015-03-05 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Work around x86 glibc backtrace bug | ||
| 4 | * sysdep.c (emacs_backtrace): Don't dump core on x86. | ||
| 5 | Fixes: bug#19959 | ||
| 6 | |||
| 1 | 2015-03-05 Eli Zaretskii <eliz@gnu.org> | 7 | 2015-03-05 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * keyboard.c (make_lispy_position): When the click is on the | 9 | * keyboard.c (make_lispy_position): When the click is on the |
diff --git a/src/sysdep.c b/src/sysdep.c index cb361ec2dc5..0a0b0ac01d0 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -2174,6 +2174,14 @@ emacs_backtrace (int backtrace_limit) | |||
| 2174 | else | 2174 | else |
| 2175 | { | 2175 | { |
| 2176 | buffer = main_backtrace_buffer; | 2176 | buffer = main_backtrace_buffer; |
| 2177 | |||
| 2178 | /* Work around 'backtrace' bug; see Bug#19959 and glibc bug#18084. */ | ||
| 2179 | if (bounded_limit < 0) | ||
| 2180 | { | ||
| 2181 | backtrace (buffer, 1); | ||
| 2182 | return; | ||
| 2183 | } | ||
| 2184 | |||
| 2177 | npointers = backtrace (buffer, bounded_limit + 1); | 2185 | npointers = backtrace (buffer, bounded_limit + 1); |
| 2178 | } | 2186 | } |
| 2179 | 2187 | ||