[PATCH 1/1] gdbserver, linux-low: add a couple of nullptr assertions.

[PATCH 1/1] gdbserver, linux-low: add a couple of nullptr assertions.

[Willgerodt, Felix]

This safeguards a couple of places that may theoretically return NULL but
must not in this specific context.  These were found by a static analysis tool.
---
 gdbserver/linux-low.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index e1806ade82f..40b6a907ad9 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -1169,6 +1169,7 @@ linux_process_target::attach (unsigned long pid)
   /* Don't ignore the initial SIGSTOP if we just attached to this
      process.  It will be collected by wait shortly.  */
   initial_thread = find_thread_ptid (ptid_t (pid, pid));
+  gdb_assert (initial_thread != nullptr);
   initial_thread->last_resume_kind = resume_stop;
 
   /* We must attach to every LWP.  If /proc is mounted, use that to
@@ -1198,6 +1199,7 @@ linux_process_target::attach (unsigned long pid)
       gdb_assert (lwpid > 0);
 
       lwp = find_lwp_pid (ptid_t (lwpid));
+      gdb_assert (lwp != nullptr);
 
       if (!WIFSTOPPED (wstat) || WSTOPSIG (wstat) != SIGSTOP)
 	{
@@ -1572,6 +1574,7 @@ linux_process_target::detach (process_info *process)
     });
 
   main_lwp = find_lwp_pid (ptid_t (process->pid));
+  gdb_assert (main_lwp != nullptr);
   detach_one_lwp (main_lwp);
 
   mourn (process);
@@ -2512,6 +2515,7 @@ linux_process_target::wait_for_event_filtered (ptid_t wait_ptid,
   else if (filter_ptid != null_ptid)
     {
       requested_child = find_lwp_pid (filter_ptid);
+      gdb_assert (requested_child != nullptr);
 
       if (stopping_threads == NOT_STOPPING_THREADS
 	  && requested_child->status_pending_p
-- 
2.34.1

Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva  
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928

Re: [PATCH 1/1] gdbserver, linux-low: add a couple of nullptr assertions.

[Tom Tromey]

>>>>> Willgerodt, Felix via Gdb-patches <gdb-patches@sourceware.org> writes:

> This safeguards a couple of places that may theoretically return NULL but
> must not in this specific context.  These were found by a static analysis tool.

Seems fine to me.
Approved-By: Tom Tromey <tom@tromey.com>

Tom

RE: [PATCH 1/1] gdbserver, linux-low: add a couple of nullptr assertions.

[Willgerodt, Felix]

> -----Original Message-----
> From: Tom Tromey <tom@tromey.com>
> Sent: Dienstag, 29. August 2023 17:42
> To: Willgerodt, Felix via Gdb-patches <gdb-patches@sourceware.org>
> Cc: Willgerodt, Felix <felix.willgerodt@intel.com>
> Subject: Re: [PATCH 1/1] gdbserver, linux-low: add a couple of nullptr assertions.
> 
> >>>>> Willgerodt, Felix via Gdb-patches <gdb-patches@sourceware.org> writes:
> 
> > This safeguards a couple of places that may theoretically return NULL but
> > must not in this specific context.  These were found by a static analysis tool.
> 
> Seems fine to me.
> Approved-By: Tom Tromey <tom@tromey.com>
> 
> Tom

Thanks, I just pushed this.

Felix
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva  
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928