summaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2022-01-25 12:09:56 +0100
committerFlorian Weimer <fweimer@redhat.com>2022-01-25 12:09:56 +0100
commitab2a2457780d224343ce05e7d8e2964c6a47fd83 (patch)
tree4556409d77e8fc85a3086d6cb7ea0f16bca2d04f /libgcc
parent0d56eb93aa6e58328fbf679a4839bfaef5c05f5c (diff)
libgcc: Fix _Unwind_Find_FDE for missing unwind data with glibc 2.35
_dl_find_object returns success even if no unwind information has been found, and dlfo_eh_frame is NULL. libgcc/ChangeLog: PR libgcc/104207 * unwind-dw2-fde-dip.c (_Unwind_Find_FDE): Add NULL check.
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/unwind-dw2-fde-dip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c
index 7de847cb120..3d6f39f5460 100644
--- a/libgcc/unwind-dw2-fde-dip.c
+++ b/libgcc/unwind-dw2-fde-dip.c
@@ -509,7 +509,7 @@ _Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases)
#ifdef DLFO_STRUCT_HAS_EH_DBASE
{
struct dl_find_object dlfo;
- if (_dl_find_object (pc, &dlfo) == 0)
+ if (_dl_find_object (pc, &dlfo) == 0 && dlfo.dlfo_eh_frame != NULL)
return find_fde_tail ((_Unwind_Ptr) pc, dlfo.dlfo_eh_frame,
# if DLFO_STRUCT_HAS_EH_DBASE
(_Unwind_Ptr) dlfo.dlfo_eh_dbase,