Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify libarchive's fuzzer (#8781) 

Co-authored-by: Julien Voisin <jvoisin@google.com>
This commit is contained in:
Julien Voisin 2022-10-14 18:56:28 +02:00 committed by GitHub
parent cd51dc3672
commit 646285eeda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
projects/libarchive/libarchive_fuzzer.cc
View File

@ -20,23 +20,7 @@
#include "archive.h"
#include "archive_entry.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);
@ -48,13 +32,12 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
return 0;
}
Buffer buffer = {buf, len};
archive_read_open(a, &buffer, NULL, reader_callback, NULL);
archive_read_open_memory(a, buf, len);
std::vector<uint8_t> data_buffer(getpagesize(), 0);
struct archive_entry *entry;
while(1) {
ret = archive_read_next_header(a, &entry);
std::vector<uint8_t> data_buffer(getpagesize(), 0);
struct archive_entry *entry;
int ret = archive_read_next_header(a, &entry);
if (ret == ARCHIVE_EOF || ret == ARCHIVE_FATAL)
break;
if (ret == ARCHIVE_RETRY)
@ -76,6 +59,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
(void)archive_entry_uid(entry);
(void)archive_entry_mtime(entry);
ssize_t r;
while ((r = archive_read_data(a, data_buffer.data(),
data_buffer.size())) > 0)
;