]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
Fix incomplete merge in r313927:
authormm <mm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sat, 18 Feb 2017 22:13:28 +0000 (22:13 +0000)
committermm <mm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sat, 18 Feb 2017 22:13:28 +0000 (22:13 +0000)
commit04cffe6786cc2938790c76360415870011113435
tree58626c49a9184e83526d452a6dbbdc037212c83f
parent082ec82f9170af82d48b403414723ebf0c5ca819
Fix incomplete merge in r313927:

MFC r313572:
  Vendor bugfixes:
    cpio reader sanity fix (OSS-Fuzz 504)
    WARC reader sanity fixes (OSS-Fuzz 511, 526, 532, 552)
    mtree reader time parsing fix (OSS-Fuzz 538)
    XAR reader memleak fix (OSS-Fuzz 551)

git-svn-id: svn://svn.freebsd.org/base/stable/10@313929 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
contrib/libarchive/libarchive/archive_read_support_format_cpio.c
contrib/libarchive/libarchive/archive_read_support_format_mtree.c
contrib/libarchive/libarchive/archive_read_support_format_warc.c
contrib/libarchive/libarchive/archive_read_support_format_xar.c