summaryrefslogtreecommitdiff
path: root/src/ln.c
diff options
context:
space:
mode:
authorJim Meyering <meyering@fb.com>2014-03-13 17:05:04 -0700
committerJim Meyering <meyering@fb.com>2014-03-13 20:05:10 -0700
commit0093ac8d57a0f1a16fd09d98f6a524dddb6053e7 (patch)
treebe5995a36e912c3881b1651c1e1a420142129560 /src/ln.c
parent4f211822dddd1777dc915f2df4e2ed3b65c68301 (diff)
downloadcoreutils-0093ac8d57a0f1a16fd09d98f6a524dddb6053e7.tar.xz
ln: with -sr, don't segfault for a TARGET of ''
Prior to this change, "ln -sr '' F" would segfault, attempting to read path2[1] in relpath.c's path_common_prefix function. This problem arises whenever canonicalize_filename_mode returns NULL. * src/ln.c (convert_abs_rel): Call relpath only when both canonicalize_filename_mode calls return non-NULL. * tests/ln/relative.sh: Add a test to trigger this failure. * THANKS.in: List reporter's name/address. * NEWS (Bug fixes): Mention it. Reported by Erik Bernstein in 739752@bugs.debian.org. Fixes http://bugs.gnu.org/17010.
Diffstat (limited to 'src/ln.c')
-rw-r--r--src/ln.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/ln.c b/src/ln.c
index aab9cf2fa..67266997e 100644
--- a/src/ln.c
+++ b/src/ln.c
@@ -149,13 +149,17 @@ convert_abs_rel (const char *from, const char *target)
char *realdest = canonicalize_filename_mode (targetdir, CAN_MISSING);
char *realfrom = canonicalize_filename_mode (from, CAN_MISSING);
- /* Write to a PATH_MAX buffer. */
- char *relative_from = xmalloc (PATH_MAX);
-
- if (!relpath (realfrom, realdest, relative_from, PATH_MAX))
+ char *relative_from = NULL;
+ if (realdest && realfrom)
{
- free (relative_from);
- relative_from = NULL;
+ /* Write to a PATH_MAX buffer. */
+ relative_from = xmalloc (PATH_MAX);
+
+ if (!relpath (realfrom, realdest, relative_from, PATH_MAX))
+ {
+ free (relative_from);
+ relative_from = NULL;
+ }
}
free (targetdir);