aboutsummaryrefslogtreecommitdiffstats
path: root/cpio
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2018-11-24 01:15:08 +0000
committerMartin Matuska <mm@FreeBSD.org>2018-11-24 01:15:08 +0000
commitfd2a102f7ba73f37fbac1c994086b23f438cbf13 (patch)
tree839a0814bd5fe79181ad1d0544f840fee2b9968b /cpio
parenta26007e8d35293595dadaee72d00911741d111ed (diff)
downloadsrc-fd2a102f7ba73f37fbac1c994086b23f438cbf13.tar.gz
src-fd2a102f7ba73f37fbac1c994086b23f438cbf13.zip
Update vendor/libarchive/dist to git 0e416f2fe757ad6841dbb3386a17d88b5c9f5533
Relevant vendor changes: PR #1080: Spelling fixes PR #1084: RAR5 reader bugfixes PR #1091: fix use-after-free in delayed newc link processing PR #1092: Fix a few obvious resource leaks and strcpy() misuses
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=340865
Diffstat (limited to 'cpio')
-rw-r--r--cpio/cpio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpio/cpio.c b/cpio/cpio.c
index 9dddf417a5a5..4fd394dea5f1 100644
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -755,8 +755,10 @@ file_to_archive(struct cpio *cpio, const char *srcpath)
}
if (cpio->option_rename)
destpath = cpio_rename(destpath);
- if (destpath == NULL)
+ if (destpath == NULL) {
+ archive_entry_free(entry);
return (0);
+ }
archive_entry_copy_pathname(entry, destpath);
/*