94fc455 Make sure pkg2 is NULL before setting it — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Make sure pkg2 is NULL before setting it

Baptiste Daroussin committed 13 years ago

commit 94fc455b7a183dadedf975800954c2a48390e4a1
parent 6a0c2fd

1 file changed +6 -5

modified libpkg/pkgdb.c

@@ -2009,6 +2009,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)

 			ERROR_SQLITE(s);
 			goto cleanup;
 		}
 		pkg2 = NULL;
 		ret = pkgdb_it_next(it, &pkg2, PKG_LOAD_BASIC);
 		if (ret != EPKG_OK) {
 			pkgdb_it_free(it);

@@ -2017,11 +2018,11 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)

 		}
 		pkg_get(pkg2, PKG_NAME, &name2, PKG_VERSION, &version2);
 		pkg_config_bool(PKG_PERMISSIVE, &permissive);
 			pkg_emit_error("%s-%s conflicts with %s-%s"
 			    " (installs files into the same place). "
 			    " Problematic file: %s%s",
 			    name, version, name2, version2, pkg_path,
 			    permissive ? " ignored" : "");
 		pkg_emit_error("%s-%s conflicts with %s-%s"
 		    " (installs files into the same place). "
 		    " Problematic file: %s%s",
 		    name, version, name2, version2, pkg_path,
 		    permissive ? " ignored" : "");
 		pkg_free(pkg2);
 		if (!permissive) {
 			pkgdb_it_free(it);