RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make realpath.c compile -Wsign-compare clean

This commit is contained in:
Damien Miller 2015-07-20 11:19:51 +10:00
parent c63c9a691d
commit d56fd18280
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openbsd-compat/realpath.c
View File

@ -33,11 +33,13 @@
#if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH) #if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH)
#include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@ -90,7 +92,7 @@ realpath(const char *path, char resolved[PATH_MAX])
*/ */
p = strchr(left, '/'); p = strchr(left, '/');
s = p ? p : left + left_len; s = p ? p : left + left_len;
if (s - left >= sizeof(next_token)) { if (s - left >= (ptrdiff_t)sizeof(next_token)) {
errno = ENAMETOOLONG; errno = ENAMETOOLONG;
return (NULL); return (NULL);
} }
@ -169,7 +171,8 @@ realpath(const char *path, char resolved[PATH_MAX])
*/ */
if (p != NULL) { if (p != NULL) {
if (symlink[slen - 1] != '/') { if (symlink[slen - 1] != '/') {
if (slen + 1 >= sizeof(symlink)) { if (slen + 1 >=
(ptrdiff_t)sizeof(symlink)) {
errno = ENAMETOOLONG; errno = ENAMETOOLONG;
return (NULL); return (NULL);
} }