summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2015-05-30 21:25:32 +0000
committerbapt <bapt@FreeBSD.org>2015-05-30 21:25:32 +0000
commit0f4e3f90c50c968b4aa8a61cf4e89913efbfe046 (patch)
tree733457c4627a2d0dfaa7150416990a0cd5639005 /usr.sbin
parent644eb326fc4976c7ca5ee8e499a5c17a692f33f5 (diff)
downloadFreeBSD-src-0f4e3f90c50c968b4aa8a61cf4e89913efbfe046.zip
FreeBSD-src-0f4e3f90c50c968b4aa8a61cf4e89913efbfe046.tar.gz
MFC: r258020 (by bdrewery)
Remove useless checks for NULL pointer before free(3) Reported by: eadler Approved by: eadler
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg/pkg.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c
index d19d139..f925519 100644
--- a/usr.sbin/pkg/pkg.c
+++ b/usr.sbin/pkg/pkg.c
@@ -321,8 +321,7 @@ free_fingerprint_list(struct fingerprint_list* list)
struct fingerprint *fingerprint, *tmp;
STAILQ_FOREACH_SAFE(fingerprint, list, next, tmp) {
- if (fingerprint->name)
- free(fingerprint->name);
+ free(fingerprint->name);
free(fingerprint);
}
free(list);
@@ -724,12 +723,9 @@ cleanup:
if (revoked)
free_fingerprint_list(revoked);
if (sc) {
- if (sc->cert)
- free(sc->cert);
- if (sc->sig)
- free(sc->sig);
- if (sc->name)
- free(sc->name);
+ free(sc->cert);
+ free(sc->sig);
+ free(sc->name);
free(sc);
}
OpenPOWER on IntegriCloud