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

xbps_symlink_target: fix a memleak.

Browse Source
This commit is contained in:
Juan RP 2015-02-19 11:36:09 +01:00
parent a05e039cce
commit 6d65e76f91
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/util.c
View File

@ -457,7 +457,7 @@ char *
xbps_symlink_target(struct xbps_handle *xhp, const char *path, const char *tgt)
{
struct stat sb;
char *p, *p1, *dname, *res = NULL, *lnk = NULL;
char *res = NULL, *lnk = NULL;
ssize_t r;
if (lstat(path, &sb) == -1)
@ -482,33 +482,33 @@ xbps_symlink_target(struct xbps_handle *xhp, const char *path, const char *tgt)
}
if (strstr(lnk, "./") || lnk[0] != '/') {
char *p, *p1, *dname, labs[PATH_MAX];
/* relative */
p = strdup(path);
assert(p);
dname = dirname(p);
assert(dname);
p = xbps_xasprintf("%s/%s", dname, lnk);
assert(p);
p1 = xbps_sanitize_path(p);
assert(p1);
snprintf(labs, sizeof(labs), "%s/%s", dname, lnk);
free(p);
if ((strstr(p1, "./")) && (p = realpath(p1, NULL))) {
p = xbps_sanitize_path(labs);
assert(p);
if ((strstr(p, "./")) && (p1 = realpath(p, NULL))) {
if (strcmp(xhp->rootdir, "/") == 0)
res = strdup(p);
else
res = strdup(p + strlen(xhp->rootdir));
free(p);
res = p1;
else {
res = strdup(p1 + strlen(xhp->rootdir));
free(p1);
}
}
if (res == NULL) {
if (strcmp(xhp->rootdir, "/") == 0)
res = strdup(p1);
res = p;
else
res = strdup(p1 + strlen(xhp->rootdir));
res = strdup(p + strlen(xhp->rootdir));
}
assert(res);
free(lnk);
free(p1);
free(p);
} else {
/* absolute */
res = lnk;