diff mbox series

libgcc: Fix _Unwind_Find_FDE for missing unwind data with glibc 2.35

Message ID 877dap2h51.fsf@oldenburg.str.redhat.com
State Committed
Commit ab2a2457780d224343ce05e7d8e2964c6a47fd83
Headers
Series libgcc: Fix _Unwind_Find_FDE for missing unwind data with glibc 2.35 |

Commit Message

Florian Weimer Jan. 24, 2022, 5:11 p.m. UTC 
  _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(-)

Comments

Jakub Jelinek Jan. 25, 2022, 11:08 a.m. UTC | #1 
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
diff mbox series

Patch

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,