From e117869ad30ae48ff0943c9497c626fddbc899ba Mon Sep 17 00:00:00 2001
From: Martin Matuska <mm@FreeBSD.org>
Date: Wed, 20 May 2020 16:13:02 +0000
Subject: Update vendor/libarchive/dist to git
 fc6563f5130d8a7ee1fc27c0e55baef35119f26c

Libarchive 3.4.3

Relevant vendor changes:
  PR #1352: support negative zstd compression levels
  PR #1359: improve zstd version checking
  PR #1348: support RHT.security.selinux from GNU tar
  PR #1357: support for archives compressed with pzstd
  PR #1367: fix issues in acl tests
  PR #1372: child handling cleanup
  PR #1378: fix memory leak from passphrase callback
---
 contrib/oss-fuzz/libarchive_fuzzer.cc | 49 +++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 contrib/oss-fuzz/libarchive_fuzzer.cc

(limited to 'contrib/oss-fuzz/libarchive_fuzzer.cc')

diff --git a/contrib/oss-fuzz/libarchive_fuzzer.cc b/contrib/oss-fuzz/libarchive_fuzzer.cc
new file mode 100644
index 000000000000..bc7f865b69c5
--- /dev/null
+++ b/contrib/oss-fuzz/libarchive_fuzzer.cc
@@ -0,0 +1,49 @@
+#include <stddef.h>
+#include <stdint.h>
+#include <vector>
+
+#include "archive.h"
+
+struct Buffer {
+  const uint8_t *buf;
+  size_t len;
+};
+
+ssize_t reader_callback(struct archive *a, void *client_data,
+                        const void **block) {
+  Buffer *buffer = reinterpret_cast<Buffer *>(client_data);
+  *block = buffer->buf;
+  ssize_t len = buffer->len;
+  buffer->len = 0;
+  return len;
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
+  int ret;
+  ssize_t r;
+  struct archive *a = archive_read_new();
+
+  archive_read_support_filter_all(a);
+  archive_read_support_format_all(a);
+
+  Buffer buffer = {buf, len};
+  archive_read_open(a, &buffer, NULL, reader_callback, NULL);
+
+  std::vector<uint8_t> data_buffer(getpagesize(), 0);
+  struct archive_entry *entry;
+  while(1) {
+    ret = archive_read_next_header(a, &entry);
+    if (ret == ARCHIVE_EOF || ret == ARCHIVE_FATAL)
+      break;
+    if (ret == ARCHIVE_RETRY)
+      continue;
+    while ((r = archive_read_data(a, data_buffer.data(),
+            data_buffer.size())) > 0)
+      ;
+    if (r == ARCHIVE_FATAL)
+      break;
+  }
+
+  archive_read_free(a);
+  return 0;
+}
-- 
cgit v1.2.3