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

* path.cc (readlink): Check if buffer length is positive. Truncate output to

Browse Source 
buffer length.  Don't terminate buffer with '\0'.
This commit is contained in:
Christopher Faylor
2000-09-04 17:52:42 +00:00
parent 9c136d7ea6
commit f76325499a
14 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
winsup/cygwin/path.cc
View File

@@ -2436,6 +2436,13 @@ int
readlink (const char *path, char *buf, int buflen)
{
extern suffix_info stat_suffixes[];
if (buflen < 0)
{
set_errno (ENAMETOOLONG);
return -1;
}
path_conv pathbuf (path, PC_SYM_CONTENTS, stat_suffixes);
if (pathbuf.error)
@@ -2452,14 +2459,8 @@ readlink (const char *path, char *buf, int buflen)
return -1;
}
int len = strlen (pathbuf.get_win32 ());
if (len > (buflen - 1))
{
set_errno (ENAMETOOLONG);
return -1;
}
int len = max (buflen, (int) strlen (pathbuf.get_win32 ()));
memcpy (buf, pathbuf.get_win32 (), len);
buf[len] = '\0';
/* errno set by symlink.check if error */
return len;