[PATCH 04/12] cygwin: Remove comparison of 'this' to 'NULL' in _pinfo::cwd
Ken Brown
kbrown@cornell.edu
Wed Sep 27 01:36:00 GMT 2017
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 08cc7ea92..453e79b16 100644
--- a/winsup/cygwin/fhandler_process.cc
+++ b/winsup/cygwin/fhandler_process.cc
@@ -498,7 +498,7 @@ format_process_cwd (void *data, char *&destbuf)
cfree (destbuf);
destbuf = NULL;
}
- destbuf = p->cwd (fs);
+ destbuf = p ? p->cwd (fs) : NULL;
if (!destbuf || !*destbuf)
{
destbuf = cstrdup ("<defunct>");
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 9fe1b3a88..c28158168 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -930,7 +930,7 @@ char *
_pinfo::cwd (size_t& n)
{
char *s = NULL;
- if (!this || !pid)
+ if (!pid)
return NULL;
if (ISSTATE (this, PID_NOTCYGWIN))
{
--
2.14.1
More information about the Cygwin-patches
mailing list