Correct pseudo-reloc size bug wrt error messages

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 12209939a39fa678ef48b9ad7d28577209c4d6eb..8141ab7548420491c08d1352155533e156959880 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-26  Charles Wilson  <cygwin@cwilson.fastmail.fm>
+
+       * lib/pseudo-reloc.c (__report_error) [CYGWIN]: Correct size bug
+       regarding error messages.
+
 2009-10-25  Charles Wilson  <cygwin@cwilson.fastmail.fm>
 
        Sync pseudo-reloc.c with mingw64

diff --git a/winsup/cygwin/lib/pseudo-reloc.c b/winsup/cygwin/lib/pseudo-reloc.c
index 736f5318df3b8deb492a1385d0b5a6f98e2fabc5..77f041114d738b82d27ff176b485cf10648421c1 100644 (file)
--- a/winsup/cygwin/lib/pseudo-reloc.c
+++ b/winsup/cygwin/lib/pseudo-reloc.c
@@ -93,7 +93,8 @@ __report_error (const char *msg, ...)
   char buf[SHORT_MSG_BUF_SZ];
   wchar_t module[MAX_PATH];
   char * posix_module = NULL;
-  static const char * UNKNOWN_MODULE = "<unknown module>: ";
+  static const char   UNKNOWN_MODULE[] = "<unknown module>: ";
+  static const size_t UNKNOWN_MODULE_LEN = sizeof (UNKNOWN_MODULE) - 1;
   static const char   CYGWIN_FAILURE_MSG[] = "Cygwin runtime failure: ";
   static const size_t CYGWIN_FAILURE_MSG_LEN = sizeof (CYGWIN_FAILURE_MSG) - 1;
   DWORD len;
@@ -130,7 +131,7 @@ __report_error (const char *msg, ...)
       WriteFile (errh, (PCVOID)CYGWIN_FAILURE_MSG,
                  CYGWIN_FAILURE_MSG_LEN, &done, NULL);
       WriteFile (errh, (PCVOID)UNKNOWN_MODULE,
-                 sizeof(UNKNOWN_MODULE), &done, NULL);
+                 UNKNOWN_MODULE_LEN, &done, NULL);
       WriteFile (errh, (PCVOID)buf, len, &done, NULL);
     }
   WriteFile (errh, (PCVOID)"\n", 1, &done, NULL);

diff --git a/winsup/cygwin/pseudo-reloc.cc b/winsup/cygwin/pseudo-reloc.cc
index 736f5318df3b8deb492a1385d0b5a6f98e2fabc5..77f041114d738b82d27ff176b485cf10648421c1 100644 (file)
--- a/winsup/cygwin/pseudo-reloc.cc
+++ b/winsup/cygwin/pseudo-reloc.cc
@@ -93,7 +93,8 @@ __report_error (const char *msg, ...)
   char buf[SHORT_MSG_BUF_SZ];
   wchar_t module[MAX_PATH];
   char * posix_module = NULL;
-  static const char * UNKNOWN_MODULE = "<unknown module>: ";
+  static const char   UNKNOWN_MODULE[] = "<unknown module>: ";
+  static const size_t UNKNOWN_MODULE_LEN = sizeof (UNKNOWN_MODULE) - 1;
   static const char   CYGWIN_FAILURE_MSG[] = "Cygwin runtime failure: ";
   static const size_t CYGWIN_FAILURE_MSG_LEN = sizeof (CYGWIN_FAILURE_MSG) - 1;
   DWORD len;
@@ -130,7 +131,7 @@ __report_error (const char *msg, ...)
       WriteFile (errh, (PCVOID)CYGWIN_FAILURE_MSG,
                  CYGWIN_FAILURE_MSG_LEN, &done, NULL);
       WriteFile (errh, (PCVOID)UNKNOWN_MODULE,
-                 sizeof(UNKNOWN_MODULE), &done, NULL);
+                 UNKNOWN_MODULE_LEN, &done, NULL);
       WriteFile (errh, (PCVOID)buf, len, &done, NULL);
     }
   WriteFile (errh, (PCVOID)"\n", 1, &done, NULL);