public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin/main] Cygwin: set ENOSHARE and ECASECLASH _sys_errlist[] entries to empty
@ 2024-02-28  9:01 Corinna Vinschen
  0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2024-02-28  9:01 UTC (permalink / raw)
  To: cygwin-cvs

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=ee97ae1d5f4d42d47d828a1b4d9b05ec9cbfe042

commit ee97ae1d5f4d42d47d828a1b4d9b05ec9cbfe042
Author:     Christian Franke <christian.franke@t-online.de>
AuthorDate: Tue Feb 27 17:21:45 2024 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Wed Feb 28 09:59:07 2024 +0100

    Cygwin: set ENOSHARE and ECASECLASH _sys_errlist[] entries to empty
    
    These errno values are no longer used by Cygwin.  Change the entries
    to empty strings instead of NULL to avoid crashes in existing
    binaries directly accessing the table.  Enhance strerror_worker()
    such that empty strings also result in "Unknown error ..." messages.
    Also add a static_assert check for the _sys_errlist[] size.
    
    Signed-off-by: Christian Franke <christian.franke@t-online.de>

Diff:
---
 winsup/cygwin/errno.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/winsup/cygwin/errno.cc b/winsup/cygwin/errno.cc
index 7d58e62ec142..004a4021e27b 100644
--- a/winsup/cygwin/errno.cc
+++ b/winsup/cygwin/errno.cc
@@ -167,8 +167,8 @@ const char *_sys_errlist[] =
 /* ESTALE 133 */	  "Stale NFS file handle",
 /* ENOTSUP 134 */	  "Not supported",
 /* ENOMEDIUM 135 */	  "No medium found",
-/* ENOSHARE 136 */	  "No such host or network path",
-/* ECASECLASH 137 */	  "Filename exists with different case",
+			  "", /* Was ENOSHARE 136, no longer used. */
+			  "", /* Was ECASECLASH 137, no longer used. */
 /* EILSEQ 138 */	  "Invalid or incomplete multibyte or wide character",
 /* EOVERFLOW 139 */	  "Value too large for defined data type",
 /* ECANCELED 140 */	  "Operation canceled",
@@ -177,6 +177,8 @@ const char *_sys_errlist[] =
 /* ESTRPIPE 143 */	  "Streams pipe error"
 };
 
+static_assert(143 + 1 == sizeof (_sys_errlist) / sizeof (_sys_errlist[0]));
+
 int NO_COPY_INIT _sys_nerr = sizeof (_sys_errlist) / sizeof (_sys_errlist[0]);
 };
 
@@ -228,7 +230,11 @@ strerror_worker (int errnum)
 {
   char *res;
   if (errnum >= 0 && errnum < _sys_nerr)
-    res = (char *) _sys_errlist [errnum];
+    {
+      res = (char *) _sys_errlist [errnum];
+      if (res && !*res)
+	res = NULL;
+    }
   else
     res = NULL;
   return res;

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-02-28  9:01 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-28  9:01 [newlib-cygwin/main] Cygwin: set ENOSHARE and ECASECLASH _sys_errlist[] entries to empty Corinna Vinschen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).