This is the mail archive of the
cygwin-patches
mailing list for the Cygwin project.
[PATCH 03/12] cygwin: Remove comparison of 'this' to 'NULL' in _pinfo::root
- From: Ken Brown <kbrown at cornell dot edu>
- To: cygwin-patches at cygwin dot com
- Date: Sat, 16 Sep 2017 22:04:11 -0400
- Subject: [PATCH 03/12] cygwin: Remove comparison of 'this' to 'NULL' in _pinfo::root
- Authentication-results: sourceware.org; auth=none
- References: <20170917020420.10488-1-kbrown@cornell.edu>
Fix all callers.
---
winsup/cygwin/fhandler_process.cc | 2 +-
winsup/cygwin/pinfo.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc
index 97436dd1b..08cc7ea92 100644
--- a/winsup/cygwin/fhandler_process.cc
+++ b/winsup/cygwin/fhandler_process.cc
@@ -478,7 +478,7 @@ format_process_root (void *data, char *&destbuf)
cfree (destbuf);
destbuf = NULL;
}
- destbuf = p->root (fs);
+ destbuf = p ? p->root (fs) : NULL;
if (!destbuf || !*destbuf)
{
destbuf = cstrdup ("<defunct>");
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index bba9ee494..9fe1b3a88 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -884,7 +884,7 @@ char *
_pinfo::root (size_t& n)
{
char *s;
- if (!this || !pid)
+ if (!pid)
return NULL;
if (pid != myself->pid && !ISSTATE (this, PID_NOTCYGWIN))
{
--
2.14.1