Make xbt_ex_setup_backtrace() survive to an empty backtrace.

diff --git a/src/xbt/backtrace_linux.c b/src/xbt/backtrace_linux.c
index ce4d0d3..4fc1ebc 100644 (file)
--- a/src/xbt/backtrace_linux.c
+++ b/src/xbt/backtrace_linux.c
@@ -107,24 +107,21 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e) //FIXME: This code could be greatly im
   struct stat stat_buf;
   char *binary_name = NULL;
 
   struct stat stat_buf;
   char *binary_name = NULL;
 

-  xbt_assert(e
-              && e->used,
-              "Backtrace not setup yet, cannot set it up for display");
+  xbt_assert(e, "Backtrace not setup yet, cannot set it up for display");

 
   e->bt_strings = NULL;
 
   if (!xbt_binary_name) /* no binary name, nothing to do */
     return;
 
 
   e->bt_strings = NULL;
 
   if (!xbt_binary_name) /* no binary name, nothing to do */
     return;
 

-  backtrace_syms = backtrace_symbols(e->bt, e->used);
-  /* ignore first one, which is this xbt_backtrace_current() */
-  e->used--;
-  memmove(backtrace_syms, backtrace_syms + 1, sizeof(char *) * e->used);
+  if (e->used <= 1)
+    return;

 
 

+  /* ignore first one, which is xbt_backtrace_current() */
+  e->used--;
+  memmove(e->bt, e->bt + 1, (sizeof *e->bt) * e->used);

 
 

-  /* Some arches only have stubs of backtrace, no implementation (hppa comes to mind) */
-  if (!e->used)
-    return;
+  backtrace_syms = backtrace_symbols(e->bt, e->used);

 
   /* build the commandline */
   if (stat(xbt_binary_name, &stat_buf)) {
 
   /* build the commandline */
   if (stat(xbt_binary_name, &stat_buf)) {

diff --git a/src/xbt/backtrace_windows.c b/src/xbt/backtrace_windows.c
index 0b2167c..0ad381d 100644 (file)
--- a/src/xbt/backtrace_windows.c
+++ b/src/xbt/backtrace_windows.c
@@ -179,16 +179,16 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
   int i;
   char **backtrace_syms;
 
   int i;
   char **backtrace_syms;
 

-  xbt_assert(e
-              && e->used,
-              "Backtrace not setup yet, cannot set it up for display");
+  xbt_assert(e, "Backtrace not setup yet, cannot set it up for display");
+
+  if (!e->used)
+    return;

 
   backtrace_syms = backtrace_symbols(e->bt, e->used);
   e->bt_strings = NULL;
   /* parse the output and build a new backtrace */
   e->bt_strings = xbt_new(char *, e->used);
 
 
   backtrace_syms = backtrace_symbols(e->bt, e->used);
   e->bt_strings = NULL;
   /* parse the output and build a new backtrace */
   e->bt_strings = xbt_new(char *, e->used);
 

-

   for (i = 0; i < e->used; i++)
     e->bt_strings[i] = backtrace_syms[i];
 
   for (i = 0; i < e->used; i++)
     e->bt_strings[i] = backtrace_syms[i];