aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/generic/unwind-dw2.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-05-02 00:50:46 +0000
committerUlrich Drepper <drepper@redhat.com>2006-05-02 00:50:46 +0000
commitafbf86d209f555381ceb07c58cc4e1741dee6d11 (patch)
tree98b149e8b1339174b98c10a216c4106258b14766 /sysdeps/generic/unwind-dw2.c
parent1e528c6e1bd9d6c7d952456eab826362f489dfbd (diff)
downloadglibc-afbf86d209f555381ceb07c58cc4e1741dee6d11.tar
glibc-afbf86d209f555381ceb07c58cc4e1741dee6d11.tar.gz
glibc-afbf86d209f555381ceb07c58cc4e1741dee6d11.tar.bz2
glibc-afbf86d209f555381ceb07c58cc4e1741dee6d11.zip
* misc/tsearch.c (__tdelete): Remove unnecessary test
[Coverity CID 75]. * sysdeps/generic/unwind-dw2.c (execute_cfa_program): Print error message for invalid DWARF data instead of crashing.
Diffstat (limited to 'sysdeps/generic/unwind-dw2.c')
-rw-r--r--sysdeps/generic/unwind-dw2.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/sysdeps/generic/unwind-dw2.c b/sysdeps/generic/unwind-dw2.c
index 5ecf2846f3..d818e5dfd8 100644
--- a/sysdeps/generic/unwind-dw2.c
+++ b/sysdeps/generic/unwind-dw2.c
@@ -25,6 +25,7 @@
#include <error.h>
#include <libintl.h>
#include <dwarf2.h>
+#include <stdio.h>
#include <unwind.h>
#include <unwind-pe.h>
#include <unwind-dw2-fde.h>
@@ -837,9 +838,16 @@ execute_cfa_program (const unsigned char *insn_ptr,
case DW_CFA_restore_state:
{
struct frame_state_reg_info *old_rs = fs->regs.prev;
- fs->regs = *old_rs;
- old_rs->prev = unused_rs;
- unused_rs = old_rs;
+#ifdef _LIBC
+ if (old_rs == NULL)
+ __libc_fatal ("invalid DWARF unwind data");
+ else
+#endif
+ {
+ fs->regs = *old_rs;
+ old_rs->prev = unused_rs;
+ unused_rs = old_rs;
+ }
}
break;