diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_proc.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 32a569829..e6d859e49 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2011-04-02 Corinna Vinschen <corinna@vinschen.de> + * fhandler_proc.cc (format_proc_partitions): Express length in WCHAR + size. + +2011-04-02 Corinna Vinschen <corinna@vinschen.de> + * autoload.cc (GetExtendedTcpTable): Remove. (GetTcpTable): Remove. (CharNextExA): Remove. diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index c46fbbe6f..c0821e92c 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -1143,7 +1143,7 @@ format_proc_partitions (void *, char *&destbuf) restart = FALSE; /* ... and check for a "Harddisk[0-9]*" entry. */ - if (dbi->ObjectName.Length < 18 + if (dbi->ObjectName.Length < 9 * sizeof (WCHAR) || wcsncasecmp (dbi->ObjectName.Buffer, L"Harddisk", 8) != 0 || !iswdigit (dbi->ObjectName.Buffer[8])) continue; |