OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Florian Weimer 2022-01-25 12:09:56 +01:00
parent 0d56eb93aa
commit ab2a245778
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libgcc/unwind-dw2-fde-dip.c
View File

@ -509,7 +509,7 @@ _Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases)
#ifdef DLFO_STRUCT_HAS_EH_DBASE #ifdef DLFO_STRUCT_HAS_EH_DBASE
{ {
struct dl_find_object dlfo; 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, return find_fde_tail ((_Unwind_Ptr) pc, dlfo.dlfo_eh_frame,
# if DLFO_STRUCT_HAS_EH_DBASE # if DLFO_STRUCT_HAS_EH_DBASE
(_Unwind_Ptr) dlfo.dlfo_eh_dbase, (_Unwind_Ptr) dlfo.dlfo_eh_dbase,