Make the status type a const char*, not a struct

This commit is contained in:
Nigel Tao committed 2018-08-12 16:05:14 +10:00
1 parent e0311e3bb2
commit b840c80040
24 files changed
+624 -815

No files matched your search

+10 -10
View File
@@ -56,14 +56,15 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_base__status z = wuffs_gif__decoder__check_wuffs_version(
&dec, sizeof dec, WUFFS_VERSION);
if (z.code) {
return wuffs_gif__status__string(z.code);
if (z) {
ret = z;
goto exit;
}
wuffs_base__image_config ic = ((wuffs_base__image_config){});
z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (z.code) {
ret = wuffs_gif__status__string(z.code);
if (z) {
ret = z;
goto exit;
}
if (!wuffs_base__image_config__is_valid(&ic)) {
@@ -87,8 +88,8 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
z = wuffs_base__pixel_buffer__set_from_slice(
&pb, wuffs_base__image_config__pixel_config(&ic),
((wuffs_base__slice_u8){.ptr = pixbuf, .len = pixbuf_size}));
if (z.code) {
ret = wuffs_gif__status__string(z.code);
if (z) {
ret = z;
goto exit;
}
@@ -96,11 +97,10 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
while (true) {
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
if (z.code) {
if ((z.code == WUFFS_BASE__SUSPENSION_END_OF_DATA) && seen_ok) {
z.code = WUFFS_BASE__STATUS_OK;
if (z) {
if ((z != wuffs_base__suspension__end_of_data) || !seen_ok) {
ret = z;
}
ret = wuffs_gif__status__string(z.code);
goto exit;
}
seen_ok = true;
+4 -6
View File
@@ -47,12 +47,11 @@ It should print "PASS", amongst other information, and exit(0).
#include "../fuzzlib/fuzzlib.c"
const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
const char* ret = NULL;
wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){});
wuffs_base__status z =
wuffs_zlib__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z.code) {
return wuffs_zlib__status__string(z.code);
if (z) {
return z;
}
// Ignore the checksum for 99.99%-ish of all input. When fuzzers generate
@@ -68,8 +67,7 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
while (true) {
dst.wi = 0;
z = wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader);
if (z.code != WUFFS_BASE__SUSPENSION_SHORT_WRITE) {
ret = wuffs_zlib__status__string(z.code);
if (z != wuffs_base__suspension__short_write) {
break;
}
if (dst.wi == 0) {
@@ -77,5 +75,5 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
intentional_segfault();
}
}
return ret;
return z;
}