public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Florian Weimer <fw@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-6857] libgcc: Fix _Unwind_Find_FDE for missing unwind data with glibc 2.35
Date: Tue, 25 Jan 2022 11:10:21 +0000 (GMT)	[thread overview]
Message-ID: <20220125111021.246043858030@sourceware.org> (raw)

https://gcc.gnu.org/g:ab2a2457780d224343ce05e7d8e2964c6a47fd83

commit r12-6857-gab2a2457780d224343ce05e7d8e2964c6a47fd83
Author: Florian Weimer <fweimer@redhat.com>
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,


                 reply	other threads:[~2022-01-25 11:10 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220125111021.246043858030@sourceware.org \
    --to=fw@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).