diff options
author | Ken Brown <kbrown@cornell.edu> | 2017-09-17 05:04:17 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2017-10-09 12:44:11 +0300 |
commit | d17c45f200c3b68fe1c99e413b0444366bfd9290 (patch) | |
tree | 3653796b0ca45b90f575f4411da917c7acf40606 | |
parent | 6cd1978fc81a2046fa0b27ff63b015f31d49ec77 (diff) |
cygwin: Remove comparison of 'this' to 'NULL' in _pinfo::environ
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 360d8ea81..eb5a523ff 100644 --- a/winsup/cygwin/fhandler_process.cc +++ b/winsup/cygwin/fhandler_process.cc @@ -583,7 +583,7 @@ format_process_environ (void *data, char *&destbuf) cfree (destbuf); destbuf = NULL; } - destbuf = p->environ (fs); + destbuf = p ? p->environ (fs) : NULL; if (!destbuf || !*destbuf) { destbuf = cstrdup ("<defunct>"); diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc index 044c4fc3c..7193f6884 100644 --- a/winsup/cygwin/pinfo.cc +++ b/winsup/cygwin/pinfo.cc @@ -1036,7 +1036,7 @@ char * _pinfo::environ (size_t& n) { char **env = NULL; - if (!this || !pid) + if (!pid) return NULL; if (ISSTATE (this, PID_NOTCYGWIN)) { |