diff options
| author | Ken Brown <kbrown@cornell.edu> | 2017-09-16 22:04:12 -0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2017-10-09 11:44:11 +0200 |
| commit | 571b7689bb690148b9747a125ff2db1d5accb561 (patch) | |
| tree | 7a469892ae6bf365dca34c84ff7672cf869869f3 | |
| parent | be436ad2a31ac3b00dabc0d39119e5fa130a2dd6 (diff) | |
| download | cygnal-571b7689bb690148b9747a125ff2db1d5accb561.tar.gz cygnal-571b7689bb690148b9747a125ff2db1d5accb561.tar.bz2 cygnal-571b7689bb690148b9747a125ff2db1d5accb561.zip | |
cygwin: Remove comparison of 'this' to 'NULL' in _pinfo::cwd
Fix all callers.
| -rw-r--r-- | winsup/cygwin/fhandler_process.cc | 2 | ||||
| -rw-r--r-- | 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)) { |