From: Jakub Jelinek <jakub@redhat.com>
To: Florian Weimer <fweimer@redhat.com>
Cc: gcc-patches@gcc.gnu.org
Subject: Re: [PATCH] libgcc: Fix _Unwind_Find_FDE for missing unwind data with glibc 2.35
Date: Tue, 25 Jan 2022 12:08:54 +0100 [thread overview]
Message-ID: <20220125110854.GF2646553@tucnak> (raw)
In-Reply-To: <877dap2h51.fsf@oldenburg.str.redhat.com>
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
prev parent reply other threads:[~2022-01-25 11:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 17:11 Florian Weimer
2022-01-25 11:08 ` Jakub Jelinek [this message]
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=20220125110854.GF2646553@tucnak \
--to=jakub@redhat.com \
--cc=fweimer@redhat.com \
--cc=gcc-patches@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).