From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 246043858030; Tue, 25 Jan 2022 11:10:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 246043858030 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Florian Weimer To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6857] libgcc: Fix _Unwind_Find_FDE for missing unwind data with glibc 2.35 X-Act-Checkin: gcc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: 0d56eb93aa6e58328fbf679a4839bfaef5c05f5c X-Git-Newrev: ab2a2457780d224343ce05e7d8e2964c6a47fd83 Message-Id: <20220125111021.246043858030@sourceware.org> Date: Tue, 25 Jan 2022 11:10:21 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jan 2022 11:10:21 -0000 https://gcc.gnu.org/g:ab2a2457780d224343ce05e7d8e2964c6a47fd83 commit r12-6857-gab2a2457780d224343ce05e7d8e2964c6a47fd83 Author: Florian Weimer Date: Tue Jan 25 12:09:56 2022 +0100 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. Diff: --- 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,