public inbox for elfutils@sourceware.org
 help / color / mirror / Atom feed
From: Mark Wielaard <mark@klomp.org>
To: elfutils-devel@sourceware.org
Cc: Mark Wielaard <mark@klomp.org>
Subject: [PATCH] backends: Check results for NULL early in dwarf_peeled_die_type
Date: Thu,  6 Apr 2023 17:04:24 +0200	[thread overview]
Message-ID: <20230406150424.476494-1-mark@klomp.org> (raw)

Calling dwarf_peeled_die_type with a NULL results pointer is an error,
check early that result is not NULL so dwarf_formref_die and
dwarf_peel_type won't try to set the NULL Dwarf_Die.

	* backends/libebl_CPU.h (dwarf_peeled_die_type): Move check
        for results == NULL to start of function.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 backends/libebl_CPU.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backends/libebl_CPU.h b/backends/libebl_CPU.h
index 3b2cc3e4..d138f5f7 100644
--- a/backends/libebl_CPU.h
+++ b/backends/libebl_CPU.h
@@ -66,13 +66,13 @@ dwarf_peeled_die_type (Dwarf_Die *die, Dwarf_Die *result)
     /* The function has no return value, like a `void' function in C.  */
     return 0;
 
-  if (dwarf_formref_die (attr, result) == NULL)
+  if (result == NULL)
     return -1;
 
-  if (dwarf_peel_type (result, result) != 0)
+  if (dwarf_formref_die (attr, result) == NULL)
     return -1;
 
-  if (result == NULL)
+  if (dwarf_peel_type (result, result) != 0)
     return -1;
 
   int tag = dwarf_tag (result);
-- 
2.39.2


             reply	other threads:[~2023-04-06 15:04 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-06 15:04 Mark Wielaard [this message]
2023-04-14 15:26 ` Mark Wielaard

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=20230406150424.476494-1-mark@klomp.org \
    --to=mark@klomp.org \
    --cc=elfutils-devel@sourceware.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).