summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-01-09 11:37:59 -0800
committerKeith Packard <keithp@keithp.com>2012-01-09 11:37:59 -0800
commit1f5587e14406c083687203030db6a11691ac9d9f (patch)
tree915c1a12a150595f1bd00e4822327cf743f9ec3c /os
parenta97252db24669a3e26a935024ea38b8a28d30586 (diff)
parent6269977c91071e0ea16ca5b4b8e15fd6db0b6fcf (diff)
Merge remote-tracking branch 'kibi/master'
Diffstat (limited to 'os')
-rw-r--r--os/backtrace.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/os/backtrace.c b/os/backtrace.c
index 58b4b1f34..298bf1898 100644
--- a/os/backtrace.c
+++ b/os/backtrace.c
@@ -46,7 +46,11 @@ void xorg_backtrace(void)
ErrorF("\nBacktrace:\n");
size = backtrace(array, 64);
for (i = 0; i < size; i++) {
- dladdr(array[i], &info);
+ int rc = dladdr(array[i], &info);
+ if (rc == 0) {
+ ErrorF("%d: ?? [%p]\n", i, array[i]);
+ continue;
+ }
mod = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)";
if (info.dli_saddr)
ErrorF("%d: %s (%s+0x%lx) [%p]\n", i, mod,