drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cygcheck: Fix broken test for invalid wcstombs conversion reading symlinks 

Fixes Coverity CID 66905

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2016-10-22 22:53:29 +02:00
parent 7909b528e5
commit bbeef8ef3f
1 changed files with 6 additions and 6 deletions
winsup/utils
path.cc

12
winsup/utils/path.cc
View File

@ -220,10 +220,10 @@ readlink (HANDLE fh, char *path, int maxlen)
} }
if (*(PWCHAR) cp == 0xfeff) /* BOM */ if (*(PWCHAR) cp == 0xfeff) /* BOM */
{ {
len = wcstombs (NULL, (wchar_t *) (cp + 2), 0); size_t wlen = wcstombs (NULL, (wchar_t *) (cp + 2), 0);
if (len == (size_t) -1 || len + 1 > maxlen) if (wlen == (size_t) -1 || wlen + 1 > maxlen)
return false; return false;
wcstombs (path, (wchar_t *) (cp + 2), len + 1); wcstombs (path, (wchar_t *) (cp + 2), wlen + 1);
} }
else if (len + 1 > maxlen) else if (len + 1 > maxlen)
return false; return false;
@ -238,10 +238,10 @@ readlink (HANDLE fh, char *path, int maxlen)
cp = buf + strlen (SYMLINK_COOKIE); cp = buf + strlen (SYMLINK_COOKIE);
if (*(PWCHAR) cp == 0xfeff) /* BOM */ if (*(PWCHAR) cp == 0xfeff) /* BOM */
{ {
len = wcstombs (NULL, (wchar_t *) (cp + 2), 0); size_t wlen = wcstombs (NULL, (wchar_t *) (cp + 2), 0);
if (len == (size_t) -1 || len + 1 > maxlen) if (wlen == (size_t) -1 || wlen + 1 > maxlen)
return false; return false;
wcstombs (path, (wchar_t *) (cp + 2), len + 1); wcstombs (path, (wchar_t *) (cp + 2), wlen + 1);
} }
else if (fi.nFileSizeLow - strlen (SYMLINK_COOKIE) > (unsigned) maxlen) else if (fi.nFileSizeLow - strlen (SYMLINK_COOKIE) > (unsigned) maxlen)
return false; return false;