Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Pedro Franco de Carvalho <pedromfc@linux.ibm.com>
To: gdb-patches@sourceware.org
Cc: kevinb@redhat.com
Subject: [PATCH] Fix access to uninitialized variable in fill_in_stop_func
Date: Thu, 08 Aug 2019 13:54:00 -0000	[thread overview]
Message-ID: <20190808135443.10894-1-pedromfc@linux.ibm.com> (raw)

This patch changes fill_in_stop_func to check the return value of
find_pc_partial_function before accessing the block pointer that is only
written by find_pc_partial_function if it returns a success status.

gdb/ChangeLog:
YYYY-MM-DD  Pedro Franco de Carvalho  <pedromfc@linux.ibm.com>

	* infrun.c (fill_in_stop_func): Use return value of
	find_pc_partial_function, remove comment.
---
 gdb/infrun.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gdb/infrun.c b/gdb/infrun.c
index a9588f896a..15c778c7f3 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -4117,13 +4117,12 @@ fill_in_stop_func (struct gdbarch *gdbarch,
     {
       const block *block;
 
-      /* Don't care about return value; stop_func_start and stop_func_name
-	 will both be 0 if it doesn't work.  */
-      find_pc_partial_function (ecs->event_thread->suspend.stop_pc,
-				&ecs->stop_func_name,
-				&ecs->stop_func_start,
-				&ecs->stop_func_end,
-				&block);
+      bool status = (find_pc_partial_function
+		     (ecs->event_thread->suspend.stop_pc,
+		      &ecs->stop_func_name,
+		      &ecs->stop_func_start,
+		      &ecs->stop_func_end,
+		      &block));
 
       /* The call to find_pc_partial_function, above, will set
 	 stop_func_start and stop_func_end to the start and end
@@ -4133,7 +4132,7 @@ fill_in_stop_func (struct gdbarch *gdbarch,
 	 the function's start offset and entrypoint.  Note that
 	 stop_func_start is NOT advanced when in a range of a
 	 non-contiguous block that does not contain the entry pc.  */
-      if (block != nullptr
+      if (status && block != nullptr
 	  && ecs->stop_func_start <= BLOCK_ENTRY_PC (block)
 	  && BLOCK_ENTRY_PC (block) < ecs->stop_func_end)
 	{
-- 
2.20.1


             reply	other threads:[~2019-08-08 13:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-08 13:54 Pedro Franco de Carvalho [this message]
2019-08-08 17:14 ` Tom Tromey
2019-08-08 17:42   ` Kevin Buettner
2019-08-09 19:13     ` Pedro Franco de Carvalho
2019-08-09 19:17       ` Kevin Buettner
2019-08-09 19:52         ` Pedro Franco de Carvalho
2019-08-09 20:42       ` Tom Tromey

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=20190808135443.10894-1-pedromfc@linux.ibm.com \
    --to=pedromfc@linux.ibm.com \
    --cc=gdb-patches@sourceware.org \
    --cc=kevinb@redhat.com \
    /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