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

Introduce xbps_sanitize_path() to fix #78 properly.

Browse Source 
This removes multiple slashes of a path and returns you a buffer with
the sanitized string.
This commit is contained in:
Juan RP
2015-02-18 15:12:39 +01:00
parent 3c34c300d1
commit 1722635e08
3 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/package_remove.c
View File

@ -96,7 +96,7 @@ static char *
symlink_target(struct xbps_handle *xhp, const char *path)
{
struct stat sb;
char *lnk, *res = NULL;
char *p, *p1, *dname, *lnk, *res = NULL;
ssize_t r;
if (lstat(path, &sb) == -1)
@ -112,8 +112,6 @@ symlink_target(struct xbps_handle *xhp, const char *path)
}
lnk[sb.st_size] = '\0';
if (strstr(lnk, "./") || lnk[0] != '/') {
char *p, *p1, *dname;
/* relative */
p = strdup(path);
assert(p);
@ -121,16 +119,26 @@ symlink_target(struct xbps_handle *xhp, const char *path)
assert(dname);
p = xbps_xasprintf("%s/%s", dname, lnk);
assert(p);
if (strstr(p, "./") && ((p1 = realpath(p, NULL)))) {
res = strdup(p1 + strlen(xhp->rootdir));
free(p1);
p1 = xbps_sanitize_path(p);
assert(p1);
free(p);
if ((strstr(p1, "./")) && (p = realpath(p1, NULL))) {
if (strcmp(xhp->rootdir, "/") == 0)
res = strdup(p);
else
res = strdup(p + strlen(xhp->rootdir));
free(p);
}
if (res == NULL) {
res = strdup(p + strlen(xhp->rootdir)+1);
if (strcmp(xhp->rootdir, "/") == 0)
res = strdup(p1);
else
res = strdup(p1 + strlen(xhp->rootdir));
}
assert(res);
free(lnk);
free(p);
free(p1);
} else {
/* absolute */
res = lnk;