[Emacs-diffs] master cbc9d8d: Work around x86 glibc backtrace bug

[Paul Eggert]

branch: master
commit cbc9d8d4269f2cca7950060b5e37747b27dac1de
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Work around x86 glibc backtrace bug
    
    * sysdep.c (emacs_backtrace): Don't dump core on x86.
    Fixes: bug#19959
---
 src/ChangeLog |    6 ++++++
 src/sysdep.c  |    8 ++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index ae827cb..6b658f5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-05  Paul Eggert  <address@hidden>
+
+       Work around x86 glibc backtrace bug
+       * sysdep.c (emacs_backtrace): Don't dump core on x86.
+       Fixes: bug#19959
+
 2015-03-05  Eli Zaretskii  <address@hidden>
 
        * keyboard.c (make_lispy_position): When the click is on the
diff --git a/src/sysdep.c b/src/sysdep.c
index cb361ec..0a0b0ac 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2174,6 +2174,14 @@ emacs_backtrace (int backtrace_limit)
   else
     {
       buffer = main_backtrace_buffer;
+
+      /* Work around 'backtrace' bug; see Bug#19959 and glibc bug#18084.  */
+      if (bounded_limit < 0)
+       {
+         backtrace (buffer, 1);
+         return;
+       }
+
       npointers = backtrace (buffer, bounded_limit + 1);
     }