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

xbps-rindex: fix memleaks in error paths.

Browse Source
This commit is contained in:
Juan RP 2013-04-04 09:55:12 +02:00
parent d536ad39ff
commit e29f2216e2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/xbps-rindex/index-add.c
View File

@ -64,8 +64,11 @@ index_add(struct xbps_handle *xhp, int argc, char **argv)
repodir = dirname(tmprepodir); repodir = dirname(tmprepodir);
/* Internalize index or create it if doesn't exist */ /* Internalize index or create it if doesn't exist */
if ((plist = xbps_pkg_index_plist(xhp, repodir)) == NULL) if ((plist = xbps_pkg_index_plist(xhp, repodir)) == NULL) {
free(tmprepodir);
return -1; return -1;
}
free(tmprepodir);
if ((idx = prop_dictionary_internalize_from_zfile(plist)) == NULL) { if ((idx = prop_dictionary_internalize_from_zfile(plist)) == NULL) {
if (errno != ENOENT) { if (errno != ENOENT) {
@ -130,6 +133,7 @@ index_add(struct xbps_handle *xhp, int argc, char **argv)
curpkgd = prop_dictionary_get(idx, pkgname); curpkgd = prop_dictionary_get(idx, pkgname);
if (curpkgd == NULL) { if (curpkgd == NULL) {
if (errno && errno != ENOENT) { if (errno && errno != ENOENT) {
free(tmpfilen);
free(pkgver); free(pkgver);
free(pkgname); free(pkgname);
return errno; return errno;
@ -165,12 +169,14 @@ index_add(struct xbps_handle *xhp, int argc, char **argv)
* objects for the index. * objects for the index.
*/ */
if ((sha256 = xbps_file_hash(argv[i])) == NULL) { if ((sha256 = xbps_file_hash(argv[i])) == NULL) {
free(tmpfilen);
free(pkgver); free(pkgver);
free(pkgname); free(pkgname);
return errno; return errno;
} }
if (!prop_dictionary_set_cstring(newpkgd, "filename-sha256", if (!prop_dictionary_set_cstring(newpkgd, "filename-sha256",
sha256)) { sha256)) {
free(tmpfilen);
free(pkgver); free(pkgver);
free(pkgname); free(pkgname);
return errno; return errno;
@ -178,6 +184,7 @@ index_add(struct xbps_handle *xhp, int argc, char **argv)
free(sha256); free(sha256);
if (stat(argv[i], &st) == -1) { if (stat(argv[i], &st) == -1) {
free(tmpfilen);
free(pkgver); free(pkgver);
free(pkgname); free(pkgname);
return errno; return errno;
@ -185,6 +192,7 @@ index_add(struct xbps_handle *xhp, int argc, char **argv)
if (!prop_dictionary_set_uint64(newpkgd, "filename-size", if (!prop_dictionary_set_uint64(newpkgd, "filename-size",
(uint64_t)st.st_size)) { (uint64_t)st.st_size)) {
free(tmpfilen);
free(pkgver); free(pkgver);
free(pkgname); free(pkgname);
return errno; return errno;
@ -209,6 +217,7 @@ index_add(struct xbps_handle *xhp, int argc, char **argv)
* Add new pkg dictionary into the index. * Add new pkg dictionary into the index.
*/ */
if (!prop_dictionary_set(idx, pkgname, newpkgd)) { if (!prop_dictionary_set(idx, pkgname, newpkgd)) {
free(tmpfilen);
free(pkgname); free(pkgname);
return EINVAL; return EINVAL;
} }