summaryrefslogtreecommitdiffstats
path: root/usr.bin/tar
diff options
context:
space:
mode:
authorcperciva <cperciva@FreeBSD.org>2008-07-05 02:21:51 +0000
committercperciva <cperciva@FreeBSD.org>2008-07-05 02:21:51 +0000
commit3cb98619294d8b67e2dd12a5c973026962787d48 (patch)
treebe725d65a1ba4e3cab64a41992eb977e256c2906 /usr.bin/tar
parent0b80c05eed74bb0c78403e0cc58dd47acb59880d (diff)
downloadFreeBSD-src-3cb98619294d8b67e2dd12a5c973026962787d48.zip
FreeBSD-src-3cb98619294d8b67e2dd12a5c973026962787d48.tar.gz
Revert CVS revision 1.68; it is now possible for entry to be NULL at the end
of write_entry. (This was perfectly safe, since archive_entry_free(NULL) is a no-op, but adding the check back makes the style more consistent.)
Diffstat (limited to 'usr.bin/tar')
-rw-r--r--usr.bin/tar/write.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/tar/write.c b/usr.bin/tar/write.c
index 28925df..50c7c73 100644
--- a/usr.bin/tar/write.c
+++ b/usr.bin/tar/write.c
@@ -950,7 +950,8 @@ abort:
if (fd >= 0)
close(fd);
- archive_entry_free(entry);
+ if (entry != NULL)
+ archive_entry_free(entry);
}
OpenPOWER on IntegriCloud