summaryrefslogtreecommitdiffstats
path: root/winsup
diff options
context:
space:
mode:
Diffstat (limited to 'winsup')
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/pinfo.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e26e0c736..a471df098 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2005-12-12 Christopher Faylor <cgf@timesys.com>
+ * pinfo.cc (winpids::add): Don't copy procinfo when there is no cygwin
+ process associated with the pid, i.e., procinfo == NULL.
+
+2005-12-12 Christopher Faylor <cgf@timesys.com>
+
* times.cc (hires_ms::usecs): Correct order when checking if high
precision time is <= current time.
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 4e8f1a899..bf82ab219 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -1130,7 +1130,7 @@ winpids::add (DWORD& nelem, bool winpid, DWORD pid)
out:
copied[nelem] = false;
- if (make_copy)
+ if (make_copy && p)
{
_pinfo *pnew = (_pinfo *) malloc (sizeof (*p.procinfo));
if (pnew)