5febf55 free() and pkg_free() can deal with NULL without need to check it before — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

free() and pkg_free() can deal with NULL without need to check it before

Baptiste Daroussin committed 13 years ago

commit 5febf5592353196f44f8762d88f2d029eac8259b
parent 22ac61f

6 files changed +12 -27

modified libpkg/pkg_attributes.c

@@ -47,6 +47,9 @@ pkg_dep_new(struct pkg_dep **d)

 void
 pkg_dep_free(struct pkg_dep *d)
 {
 	if (d == NULL)
 		return;
 	sbuf_free(d->origin);
 	sbuf_free(d->name);
 	sbuf_free(d->version);

@@ -296,9 +299,6 @@ pkg_license_new(struct pkg_license **l)

 void
 pkg_license_free(struct pkg_license *l)
 {
 	if (l == NULL)
 		return;
 	free(l);
 }

@@ -328,9 +328,6 @@ pkg_user_new(struct pkg_user **u)

 void
 pkg_user_free(struct pkg_user *u)
 {
 	if (u == NULL)
 		return;
 	free(u);
 }

@@ -368,9 +365,6 @@ pkg_group_new(struct pkg_group **g)

 void
 pkg_group_free(struct pkg_group *g)
 {
 	if (g == NULL)
 		return;
 	free(g);
 }

modified libpkg/pkg_create.c

@@ -150,8 +150,7 @@ pkg_create_archive(const char *outdir, struct pkg *pkg, pkg_formats format,

 	if (packing_init(&pkg_archive, pkg_path, format) != EPKG_OK)
 		pkg_archive = NULL;
 	if (pkg_path != NULL)
 		free(pkg_path);
 	free(pkg_path);
 	return pkg_archive;
 }

@@ -304,10 +303,8 @@ pkg_create_staged(const char *outdir, pkg_formats format, const char *rootdir,

 	ret = EPKG_OK;
 cleanup:
 	if (pkg != NULL)
 		free(pkg);
 	if (manifest != NULL)
 		free(manifest);
 	free(pkg);
 	free(manifest);
 	if (ret == EPKG_OK)
 		ret = packing_finish(pkg_archive);
 	return ret;

modified libpkg/update.c

@@ -155,8 +155,7 @@ pkg_update(const char *name, const char *packagesite, bool force)

 	}
 	if (pkg_config_string(PKG_CONFIG_REPOKEY, &repokey) != EPKG_OK) {
 		if (sig != NULL)
 			free(sig);
 		free(sig);
 		return (EPKG_FATAL);
 	}

modified pkg/clean.c

@@ -337,10 +337,8 @@ exec_clean(int argc, char **argv)

 cleanup:
 	free_dellist(&dl);
 	if (pkg != NULL)
 		pkg_free(pkg);
 	if (p != NULL)
 		pkg_free(p);
 	pkg_free(pkg);
 	pkg_free(p);
 	if (fts != NULL)
 		fts_close(fts);
 	if (db != NULL)

modified pkg/register.c

@@ -187,8 +187,7 @@ exec_register(int argc, char **argv)

 		return (EX_IOERR);
 	}
 	if (plist != NULL)
 		free(plist);
 	free(plist);
 	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) {
 		return (EX_IOERR);

modified pkg/set.c

@@ -175,8 +175,7 @@ exec_set(int argc, char **argv)

 	i = 0;
 	do {
 		if ((it = pkgdb_query(db, argv[i], match)) == NULL) {
 			if (oldorigin != NULL)
 				free(oldorigin);
 			free(oldorigin);
 			pkgdb_close(db);
 			return (EX_IOERR);
 		}

@@ -213,8 +212,7 @@ exec_set(int argc, char **argv)

 		i++;
 	} while (i < argc);
 	if (oldorigin != NULL)
 		free(oldorigin);
 	free(oldorigin);
 	pkg_free(pkg);
 	pkgdb_close(db);