d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull a copy of the input string before calling basename() and dirname().

Browse Source 
POSIX allows implementations of these functions to modify their input.
This commit is contained in:
Ed Schouten 2016-07-28 16:06:37 +00:00
parent f0d2919243
commit 491cb043bd
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=303450
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/xinstall/xinstall.c
View File

@ -656,7 +656,7 @@ makelink(const char *from_name, const char *to_name,
}
if (dolink & LN_RELATIVE) {
char *cp, *d, *s;
char *to_name_copy, *cp, *d, *s;
if (*from_name != '/') {
/* this is already a relative link */
@ -674,7 +674,10 @@ makelink(const char *from_name, const char *to_name,
* The last component of to_name may be a symlink,
* so use realpath to resolve only the directory.
*/
cp = dirname(to_name);
to_name_copy = strdup(to_name);
if (to_name_copy == NULL)
err(EX_OSERR, "%s: strdup", to_name);
cp = dirname(to_name_copy);
if (realpath(cp, dst) == NULL)
err(EX_OSERR, "%s: realpath", cp);
/* .. and add the last component. */
@ -682,9 +685,11 @@ makelink(const char *from_name, const char *to_name,
if (strlcat(dst, "/", sizeof(dst)) > sizeof(dst))
errx(1, "resolved pathname too long");
}
cp = basename(to_name);
strcpy(to_name_copy, to_name);
cp = basename(to_name_copy);
if (strlcat(dst, cp, sizeof(dst)) > sizeof(dst))
errx(1, "resolved pathname too long");
free(to_name_copy);
/* Trim common path components. */
for (s = src, d = dst; *s == *d; s++, d++)