mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 00:47:28 +01:00
Make the fuzz harness print status messages
This commit is contained in:
1 parent
2a97a1ad29
commit
db308f1045
3 files changed
+42
-15
No files matched your search
+18
-3
@@ -38,7 +38,8 @@ It should print "PASS", amongst other information, and exit(0).
|
||||
#include "../../../gen/c/std/gif.c"
|
||||
#include "../fuzzlib/fuzzlib.c"
|
||||
|
||||
void fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
const char* ret = NULL;
|
||||
void* pixbuf = NULL;
|
||||
|
||||
// Use a {} code block so that "goto exit" doesn't trigger "jump bypasses
|
||||
@@ -50,23 +51,31 @@ void fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
|
||||
wuffs_base__image_config ic = {{0}};
|
||||
s = wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
if (s || !wuffs_base__image_config__is_valid(&ic)) {
|
||||
if (s) {
|
||||
ret = wuffs_gif__status__string(s);
|
||||
goto exit;
|
||||
}
|
||||
if (!wuffs_base__image_config__is_valid(&ic)) {
|
||||
ret = "invalid image_config";
|
||||
goto exit;
|
||||
}
|
||||
|
||||
size_t pixbuf_size = wuffs_base__image_config__pixbuf_size(&ic);
|
||||
// Don't try to allocate more than 64 MiB.
|
||||
if (pixbuf_size > 64 * 1024 * 1024) {
|
||||
ret = "image too large";
|
||||
goto exit;
|
||||
}
|
||||
pixbuf = malloc(pixbuf_size);
|
||||
if (!pixbuf) {
|
||||
ret = "out of memory";
|
||||
goto exit;
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer dst = {.ptr = (uint8_t*)(pixbuf), .len = pixbuf_size};
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(&dst);
|
||||
|
||||
bool seen_ok = false;
|
||||
while (true) {
|
||||
// TODO: handle the frame rect being larger than the image rect. The
|
||||
// GIF89a spec doesn't disallow this and the Wuffs code tolerates it, in
|
||||
@@ -76,8 +85,13 @@ void fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
dst.wi = 0;
|
||||
s = wuffs_gif__decoder__decode_frame(&dec, dst_writer, src_reader);
|
||||
if (s) {
|
||||
break;
|
||||
if ((s == WUFFS_GIF__SUSPENSION_END_OF_DATA) && seen_ok) {
|
||||
s = WUFFS_GIF__STATUS_OK;
|
||||
}
|
||||
ret = wuffs_gif__status__string(s);
|
||||
goto exit;
|
||||
}
|
||||
seen_ok = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,4 +99,5 @@ exit:
|
||||
if (pixbuf) {
|
||||
free(pixbuf);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
@@ -40,7 +40,8 @@ It should print "PASS", amongst other information, and exit(0).
|
||||
#include "../../../gen/c/std/zlib.c"
|
||||
#include "../fuzzlib/fuzzlib.c"
|
||||
|
||||
void fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
const char* ret = NULL;
|
||||
wuffs_zlib__status s;
|
||||
wuffs_zlib__decoder dec;
|
||||
wuffs_zlib__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
@@ -59,6 +60,7 @@ void fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
dst.wi = 0;
|
||||
s = wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader);
|
||||
if (s != WUFFS_ZLIB__SUSPENSION_SHORT_WRITE) {
|
||||
ret = wuffs_zlib__status__string(s);
|
||||
break;
|
||||
}
|
||||
if (dst.wi == 0) {
|
||||
@@ -66,4 +68,5 @@ void fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
intentional_segfault();
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
Reference in new issue
Block a user