d49a027 Fix coredump in pkg-add. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix coredump in pkg-add.

Vsevolod Stakhov committed 12 years ago

commit d49a02798e96a2be91c6bd33c5d4e0dbbb518e2a
parent 1925106

1 file changed +5 -1

modified libpkg/pkg_add.c

@@ -223,11 +223,13 @@ pkg_add(struct pkgdb *db, const char *path, unsigned flags, struct pkg_manifest_

 			pkg_emit_already_installed(pkg_inst);
 			retcode = EPKG_INSTALLED;
 			pkg_free(pkg_inst);
 			pkg_inst = NULL;
 			goto cleanup;
 		}
 		else {
 			pkg_emit_notice("package %s is already installed, forced install", name);
 			pkg_free(pkg_inst);
 			pkg_inst = NULL;
 		}
 	} else if (ret != EPKG_END) {
 		retcode = ret;

@@ -339,7 +341,9 @@ pkg_add(struct pkgdb *db, const char *path, unsigned flags, struct pkg_manifest_

 		archive_read_free(a);
 	pkg_free(pkg);
 	pkg_free(pkg_inst);
 	if (pkg_inst != NULL)
 		pkg_free(pkg_inst);
 	return (retcode);
 }