mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 00:38:14 +01:00
Have check_wuffs_version return a status code
This commit is contained in:
1 parent
845ffbeb86
commit
fd43e777bc
21 files changed
+628
-466
No files matched your search
+16
-13
@@ -53,14 +53,17 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
// Use a {} code block so that "goto exit" doesn't trigger "jump bypasses
|
||||
// variable initialization" warnings.
|
||||
{
|
||||
wuffs_base__status s = 0;
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
wuffs_base__status z = wuffs_gif__decoder__check_wuffs_version(
|
||||
&dec, sizeof dec, WUFFS_VERSION);
|
||||
if (z) {
|
||||
return wuffs_gif__status__string(z);
|
||||
}
|
||||
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
s = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
|
||||
if (s) {
|
||||
ret = wuffs_gif__status__string(s);
|
||||
z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
|
||||
if (z) {
|
||||
ret = wuffs_gif__status__string(z);
|
||||
goto exit;
|
||||
}
|
||||
if (!wuffs_base__image_config__is_valid(&ic)) {
|
||||
@@ -81,23 +84,23 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
goto exit;
|
||||
}
|
||||
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
|
||||
s = wuffs_base__pixel_buffer__set_from_slice(
|
||||
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 (s) {
|
||||
ret = wuffs_gif__status__string(s);
|
||||
if (z) {
|
||||
ret = wuffs_gif__status__string(z);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
bool seen_ok = false;
|
||||
while (true) {
|
||||
s = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
|
||||
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
|
||||
((wuffs_base__slice_u8){}));
|
||||
if (s) {
|
||||
if ((s == WUFFS_BASE__SUSPENSION_END_OF_DATA) && seen_ok) {
|
||||
s = WUFFS_BASE__STATUS_OK;
|
||||
if (z) {
|
||||
if ((z == WUFFS_BASE__SUSPENSION_END_OF_DATA) && seen_ok) {
|
||||
z = WUFFS_BASE__STATUS_OK;
|
||||
}
|
||||
ret = wuffs_gif__status__string(s);
|
||||
ret = wuffs_gif__status__string(z);
|
||||
goto exit;
|
||||
}
|
||||
seen_ok = true;
|
||||
|
||||
@@ -48,9 +48,12 @@ It should print "PASS", amongst other information, and exit(0).
|
||||
|
||||
const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
const char* ret = NULL;
|
||||
wuffs_base__status s = 0;
|
||||
wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){});
|
||||
wuffs_zlib__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
wuffs_base__status z =
|
||||
wuffs_zlib__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
if (z) {
|
||||
return wuffs_zlib__status__string(z);
|
||||
}
|
||||
|
||||
// Ignore the checksum for 99.99%-ish of all input. When fuzzers generate
|
||||
// random input, the checkum is very unlikely to match. Still, it's useful to
|
||||
@@ -64,9 +67,9 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
|
||||
while (true) {
|
||||
dst.wi = 0;
|
||||
s = wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader);
|
||||
if (s != WUFFS_BASE__SUSPENSION_SHORT_WRITE) {
|
||||
ret = wuffs_zlib__status__string(s);
|
||||
z = wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader);
|
||||
if (z != WUFFS_BASE__SUSPENSION_SHORT_WRITE) {
|
||||
ret = wuffs_zlib__status__string(z);
|
||||
break;
|
||||
}
|
||||
if (dst.wi == 0) {
|
||||
|
||||
Reference in new issue
Block a user