ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

Fix crash when specified filename has no path separators #36

Merged
bdrewery merged 1 commits from fix-crash-without-pathseps into master 2012-08-25 22:15:08 +00:00
Conversation 0 Commits 1 Files Changed 1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg.c
View File

@ -131,7 +131,7 @@ pkg_get_parent_dir(pkg_t *pkg)
char *pathbuf;
strlcpy(buf, pkg->filename, sizeof buf);
pathbuf = strrchr(buf, PKG_DIR_SEP_S);
if ((pathbuf = strrchr(buf, PKG_DIR_SEP_S)) != NULL)
pathbuf[0] = '\0';
return buf;
@ -154,8 +154,10 @@ pkg_new_from_file(const char *filename, FILE *f)
pkg->vars = pkg_tuple_add(pkg->vars, "pcfiledir", pkg_get_parent_dir(pkg));
/* make module id */
idptr = strrchr(pkg->filename, PKG_DIR_SEP_S);
if ((idptr = strrchr(pkg->filename, PKG_DIR_SEP_S)) != NULL)
idptr++;
else
idptr = pkg->filename;
pkg->id = strdup(idptr);
idptr = strrchr(pkg->id, '.');