JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix length returned from sys_cp_wcstombs in case nwc > # of wchars

Browse Source 
* strfuncs.cc (sys_cp_wcstombs): Always return number of multibytes
	without trailing NUL as the documentation implies.  Throughout Cygwin,
	fix usage to align to this pattern.
	* fhandler_process.cc (format_process_winexename): Drop trailing NUL
	and LF from output.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2015-10-22 14:22:07 +02:00
parent c0345822e5
commit ef75017378
9 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/path.cc
View File

@@ -2167,7 +2167,7 @@ symlink_info::check_shortcut (HANDLE h)
{
char *tmpbuf = tp.c_get ();
if (sys_wcstombs (tmpbuf, NT_MAX_PATH, (PWCHAR) (cp + 2))
> SYMLINK_MAX + 1)
> SYMLINK_MAX)
return 0;
res = posixify (tmpbuf);
}
@@ -2248,7 +2248,7 @@ symlink_info::check_sysfile (HANDLE h)
srcbuf += 2;
char *tmpbuf = tp.c_get ();
if (sys_wcstombs (tmpbuf, NT_MAX_PATH, (PWCHAR) srcbuf)
> SYMLINK_MAX + 1)
> SYMLINK_MAX)
debug_printf ("symlink string too long");
else
res = posixify (tmpbuf);
@@ -2368,7 +2368,7 @@ symlink_info::check_nfs_symlink (HANDLE h)
PWCHAR spath = (PWCHAR)
(pffei->EaName + pffei->EaNameLength + 1);
res = sys_wcstombs (contents, SYMLINK_MAX + 1,
spath, pffei->EaValueLength) - 1;
spath, pffei->EaValueLength);
pflags |= PATH_SYMLINK;
}
return res;