aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2005-09-22 17:06:48 +0000
committerChristopher Faylor <me@cgf.cx>2005-09-22 17:06:48 +0000
commit378017d7c29a8620cb761d5aaff38a97d091bdb4 (patch)
tree4ceb0b95895a8112d8fc4ecc95ab1f856aa334b3
parent7e7a719a8e28a1be4fbb59fe7d15b445b8ce272c (diff)
downloadnewlib-378017d7c29a8620cb761d5aaff38a97d091bdb4.zip
newlib-378017d7c29a8620cb761d5aaff38a97d091bdb4.tar.gz
newlib-378017d7c29a8620cb761d5aaff38a97d091bdb4.tar.bz2
* strace.cc (strace::vsprntf): Avoid accessing myself->pid if !myself.
-rw-r--r--winsup/cygwin/ChangeLog4
-rw-r--r--winsup/cygwin/strace.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 63ef597..e901847 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,9 @@
2005-09-22 Christopher Faylor <cgf@timesys.com>
+ * strace.cc (strace::vsprntf): Avoid accessing myself->pid if !myself.
+
+2005-09-22 Christopher Faylor <cgf@timesys.com>
+
* include/sys/strace.h (_STRACE_ON): Remove semicolon from definition.
(_STRACE_OFF): Remove semicolon from definition.
diff --git a/winsup/cygwin/strace.cc b/winsup/cygwin/strace.cc
index 38b00f6..104be71 100644
--- a/winsup/cygwin/strace.cc
+++ b/winsup/cygwin/strace.cc
@@ -149,7 +149,7 @@ strace::vsprntf (char *buf, const char *func, const char *infmt, va_list ap)
*p = '\000';
p = progname;
count = __small_sprintf (buf, fmt, p && *p ? p : "?",
- myself->pid ?: GetCurrentProcessId (),
+ myself ? myself->pid : GetCurrentProcessId (),
execing ? "!" : "");
if (func)
count += getfunc (buf + count, func);