diff options
author | kib <kib@FreeBSD.org> | 2010-04-20 14:22:29 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2010-04-20 14:22:29 +0000 |
commit | 725cebd246e10b7880ec8ad635d2ca6c66306310 (patch) | |
tree | dce701aa8168a183deb7c45c488c88033d3a2c76 /lib/libc | |
parent | 6dda1433c86cda66eaf9707c7b94669836240a0e (diff) | |
download | FreeBSD-src-725cebd246e10b7880ec8ad635d2ca6c66306310.zip FreeBSD-src-725cebd246e10b7880ec8ad635d2ca6c66306310.tar.gz |
Free() is not allowed to modify errno, remove safety brackets around it [1].
Add small optimization, do not copy a string to the buffer that is
to be freed immediately after.
Noted by: jh [1]
Reviewed by: jh
MFC after: 2 weeks
Diffstat (limited to 'lib/libc')
-rw-r--r-- | lib/libc/stdlib/realpath.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c index 31c93e6..e75ee4a 100644 --- a/lib/libc/stdlib/realpath.c +++ b/lib/libc/stdlib/realpath.c @@ -84,12 +84,10 @@ realpath(const char * __restrict path, char * __restrict resolved) left_len = strlcpy(left, path + 1, sizeof(left)); } else { if (getcwd(resolved, PATH_MAX) == NULL) { - strlcpy(resolved, ".", PATH_MAX); - if (m) { - serrno = errno; + if (m) free(resolved); - errno = serrno; - } + else + strlcpy(resolved, ".", PATH_MAX); return (NULL); } resolved_len = strlen(resolved); @@ -168,11 +166,8 @@ realpath(const char * __restrict path, char * __restrict resolved) errno = serrno; return (resolved); } - if (m) { - serrno = errno; + if (m) free(resolved); - errno = serrno; - } return (NULL); } if (S_ISLNK(sb.st_mode)) { @@ -184,11 +179,8 @@ realpath(const char * __restrict path, char * __restrict resolved) } slen = readlink(resolved, symlink, sizeof(symlink) - 1); if (slen < 0) { - if (m) { - serrno = errno; + if (m) free(resolved); - errno = serrno; - } return (NULL); } symlink[slen] = '\0'; |