1da2bac fix, leak & wrong memory read — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

fix, leak & wrong memory read

Philippe Pepiot committed 15 years ago

commit 1da2bac8823009ca09a4d3f6a31f7255d91cd95a
parent b708227

2 files changed +7 -5

modified libpkg/pkg_ports.c

@@ -90,8 +90,10 @@ ports_parse_plist(struct pkg *pkg, char *plist, const char *prefix)

 			ret += pkg_addfile(pkg, path, p, -1);
 		}
 		plist_p += next + 1;
 		next = strlen(plist_p);
 		if (i != nbel) {
 			plist_p += next + 1;
 			next = strlen(plist_p);
 		}
 	}
 	free(plist_buf);

modified pkg/info.c

@@ -82,7 +82,7 @@ exec_info(int argc, char **argv)

 	struct pkgdb *db;
 	struct pkgdb_it *it;
 	int query_flags = PKG_BASIC;
 	struct pkg *pkg;
 	struct pkg *pkg = NULL;
 	struct pkg **deps;
 	struct pkg_file **files;
 	unsigned char opt = 0;

@@ -141,6 +141,8 @@ exec_info(int argc, char **argv)

 	if (argc == 0)
 		match = MATCH_ALL;
 	pkg_new(&pkg);
 	/* if the last argument is a file then query directly the file */
 	if (argc == 1 && pkg_open(argv[0], &pkg, query_flags) == 0)
 		return (query_pkg(pkg, opt));

@@ -163,9 +165,7 @@ exec_info(int argc, char **argv)

 	if (opt & INFO_ORIGIN_SEARCH)
 		gotone = true;
 	/* end of compatibility hacks */
 	pkg_new(&pkg);
 	while (pkgdb_it_next_pkg(it, &pkg, query_flags) == 0) {
 		gotone = true;