* kill (getsig): Avoid buffer overflow when generating a signal name.

* strace.cc (handle_output_debug_string): Make error a little more specific.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 2e24ff2..64b530d 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-26  Christopher Faylor  <cgf@timesys.com>
+
+       * kill (getsig): Avoid buffer overflow when generating a signal name.
+
+       * strace.cc (handle_output_debug_string): Make error a little more specific.
+
 2005-02-23  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
 
        * cygpath.cc (usage): Clarify help output to indicate acceptance

diff --git a/winsup/utils/kill.cc b/winsup/utils/kill.cc
index d7ae53c..071516c 100644 (file)
--- a/winsup/utils/kill.cc
+++ b/winsup/utils/kill.cc
@@ -87,7 +87,7 @@ getsig (const char *in_sig)
     sig = in_sig;
   else
     {
-      sprintf (buf, "SIG%s", in_sig);
+      sprintf (buf, "SIG%-20.20s", in_sig);
       sig = buf;
     }
   intsig = strtosigno (sig) ?: atoi (in_sig);

diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc
index 747880c..998350c 100644 (file)
--- a/winsup/utils/strace.cc
+++ b/winsup/utils/strace.cc
@@ -446,8 +446,8 @@ handle_output_debug_string (DWORD id, LPVOID p, unsigned mask, FILE *ofile)
       if (!WriteProcessMemory (hchild, (LPVOID) n, &new_flag,
                               sizeof (new_flag), &nbytes))
        error (0,
-              "couldn't write strace flag to subprocess, windows error %d",
-              GetLastError ());
+              "couldn't write strace flag to subprocess at %p, windows error %d",
+              n, GetLastError ());
       return;
     }