* [PATCH] libgcc: Fix _Unwind_Find_FDE for missing unwind data with glibc 2.35
@ 2022-01-24 17:11 Florian Weimer
2022-01-25 11:08 ` Jakub Jelinek
0 siblings, 1 reply; 2+ messages in thread
From: Florian Weimer @ 2022-01-24 17:11 UTC (permalink / raw)
To: gcc-patches
_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.
---
libgcc/unwind-dw2-fde-dip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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,
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] libgcc: Fix _Unwind_Find_FDE for missing unwind data with glibc 2.35
2022-01-24 17:11 [PATCH] libgcc: Fix _Unwind_Find_FDE for missing unwind data with glibc 2.35 Florian Weimer
@ 2022-01-25 11:08 ` Jakub Jelinek
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Jelinek @ 2022-01-25 11:08 UTC (permalink / raw)
To: Florian Weimer; +Cc: gcc-patches
On Mon, Jan 24, 2022 at 06:11:22PM +0100, Florian Weimer via Gcc-patches wrote:
> _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.
>
> ---
> libgcc/unwind-dw2-fde-dip.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Ok, thanks.
> 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,
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-25 11:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-24 17:11 [PATCH] libgcc: Fix _Unwind_Find_FDE for missing unwind data with glibc 2.35 Florian Weimer
2022-01-25 11:08 ` Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).