675a301 More minor resources leaks — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

More minor resources leaks

Baptiste Daroussin committed 10 years ago

commit 675a30180d001fc0252e236380cb4e65d3a0c3c7
parent d1058ee

3 files changed +9 -2

modified libpkg/pkg_jobs.c

@@ -411,6 +411,7 @@ pkg_jobs_add_req(struct pkg_jobs *j, struct pkg *pkg)

 		req = calloc(1, sizeof(*req));
 		if (req == NULL) {
 			pkg_emit_errno("malloc", "struct pkg_job_request");
 			free(nit);
 			return (NULL);
 		}
 		HASH_ADD_KEYPTR(hh, *head, pkg->uid, strlen(pkg->uid), req);

modified libpkg/pkg_repo_create.c

@@ -317,6 +317,7 @@ pkg_create_repo_worker(struct pkg_fts_item *start, size_t nelts,

 	switch(pid) {
 	case -1:
 		pkg_emit_errno("pkg_create_repo_worker", "fork");
 		sbuf_delete(b);
 		close(mfd);
 		if (read_files)
 			close(ffd);

@@ -326,6 +327,7 @@ pkg_create_repo_worker(struct pkg_fts_item *start, size_t nelts,

 		break;
 	default:
 		/* Parent */
 		sbuf_delete(b);
 		close(mfd);
 		if (read_files)
 			close(ffd);

@@ -444,6 +446,7 @@ pkg_create_repo_worker(struct pkg_fts_item *start, size_t nelts,

 cleanup:
 	pkg_manifest_keys_free(keys);
 	sbuf_delete(b);
 	write(pip, ".\n", 2);
 	close(pip);
 	close(mfd);

modified src/audit.c

@@ -216,13 +216,16 @@ exec_audit(int argc, char **argv)

 		 */
 		ret = pkgdb_access(PKGDB_MODE_READ, PKGDB_DB_LOCAL);
 		if (ret == EPKG_ENODB)
 		if (ret == EPKG_ENODB) {
 			pkg_audit_free(audit);
 			return (EX_OK);
 		else if (ret == EPKG_ENOACCESS) {
 		} else if (ret == EPKG_ENOACCESS) {
 			warnx("Insufficient privileges to read the package database");
 			pkg_audit_free(audit);
 			return (EX_NOPERM);
 		} else if (ret != EPKG_OK) {
 			warnx("Error accessing the package database");
 			pkg_audit_free(audit);
 			return (EX_IOERR);
 		}