summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremie Koenig <jk@jk.fr.eu.org>2010-05-27 13:32:19 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-07-18 22:43:05 (GMT)
commitb175462422f02a159a14dc5561d8bef6f84b2b66 (patch)
tree3cac1b222d0222bbf52edaff95a9c3bf388b3bd8
parentdaf286cda559dd1eff0c9db46a4562c0255e76f1 (diff)
downloadbusybox-b175462422f02a159a14dc5561d8bef6f84b2b66.tar.gz
busybox-b175462422f02a159a14dc5561d8bef6f84b2b66.tar.bz2
readlink: use xmalloc_realpath()
Using realpath() directly with a non-NULL output buffer is unsafe because its behavior is unspecified on systems which don't have PATH_MAX (ie. Hurd) I beleive this also fixes a small bug whereby 'buf' would not be freed on 'readlink -v' with ENABLE_FEATURE_CLEANUP. Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/readlink.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/coreutils/readlink.c b/coreutils/readlink.c
index 20df38b..2ed5e2c 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
@@ -36,7 +36,6 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
{
char *buf;
char *fname;
- char pathbuf[PATH_MAX];
IF_FEATURE_READLINK_FOLLOW(
unsigned opt;
@@ -56,7 +55,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
logmode = LOGMODE_NONE;
if (opt & 1) { /* -f */
- buf = realpath(fname, pathbuf);
+ buf = xmalloc_realpath(fname);
} else {
buf = xmalloc_readlink_or_warn(fname);
}
@@ -65,7 +64,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
return EXIT_FAILURE;
printf((opt & 2) ? "%s" : "%s\n", buf);
- if (ENABLE_FEATURE_CLEAN_UP && !opt)
+ if (ENABLE_FEATURE_CLEAN_UP)
free(buf);
fflush_stdout_and_exit(EXIT_SUCCESS);