29b4906 cleanup: both pkgdb_it_free() and pkg_free() handle NULL as argument. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

cleanup: both pkgdb_it_free() and pkg_free() handle NULL as argument.

Alexandre Perrin committed 10 years ago

commit 29b49065ebf3534ec014682ae63212bccff236c9
parent d2b8a36

2 files changed +2 -4

modified src/audit.c

@@ -251,8 +251,7 @@ exec_audit(int argc, char **argv)

 			ret = EX_OK;
 		}
 		if (db != NULL) {
 			if (it != NULL)
 				pkgdb_it_free(it);
 			pkgdb_it_free(it);
 			pkgdb_release_lock(db, PKGDB_LOCK_READONLY);
 			pkgdb_close(db);
 		}

modified src/convert.c

@@ -98,8 +98,7 @@ convert_from_old(const char *pkg_add_dbdir, bool dry_run)

 			if (strcmp(dp->d_name, ".") == 0 ||
 			    strcmp(dp->d_name, "..") == 0)
 				continue;
 			if (p != NULL)
 				pkg_free(p);
 			pkg_free(p);
 			if (pkg_new(&p, PKG_OLD_FILE) != EPKG_OK)
 				err(EX_OSERR, "malloc");
 			printf("Converting %s...\n", dp->d_name);