emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-create: improve d6605e1b97 (sanitize destdir to resolve target files in symlinks).

Browse Source 
Previously in d6605e1b97 if destdir had trailing '/' the behavior
of detecting target files in symlinks was changed slightly.
This commit is contained in:
Juan RP 2013-05-27 13:03:40 +02:00
parent d6605e1b97
commit fa9d3471d9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/xbps-create/main.c
View File

@ -178,7 +178,7 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf)
{ {
struct xentry *xe = NULL; struct xentry *xe = NULL;
const char *filep = NULL; const char *filep = NULL;
char *buf, *p, *dname; char *buf, *p, *p2, *dname;
ssize_t r; ssize_t r;
(void)ftwbuf; (void)ftwbuf;
@ -237,7 +237,14 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf)
*/ */
xe->target = strdup(buf); xe->target = strdup(buf);
} else { } else {
xe->target = strdup(p + strlen(destdir) - 1); /*
* Sanitize destdir just in case.
*/
if ((p2 = realpath(destdir, NULL)) == NULL)
die("failed to sanitize destdir %s: %s", destdir, strerror(errno));
xe->target = strdup(p+strlen(p2));
free(p2);
free(p); free(p);
} }
} else if (strchr(buf, '/') == NULL) { } else if (strchr(buf, '/') == NULL) {