mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 08:47:28 +01:00
Make wuffs_base__status a struct
This commit is contained in:
1 parent
c50f16e58b
commit
e6db7f6a40
24 files changed
+677
-499
No files matched your search
+13
-13
@@ -57,19 +57,19 @@ const char* fuzz(wuffs_base__io_buffer* src, uint32_t hash) {
|
||||
// variable initialization" warnings.
|
||||
{
|
||||
wuffs_gif__decoder dec;
|
||||
const char* status = wuffs_gif__decoder__initialize(
|
||||
wuffs_base__status status = wuffs_gif__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
(hash & 1) ? WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED
|
||||
: 0);
|
||||
if (status) {
|
||||
ret = status;
|
||||
if (!wuffs_base__status__is_ok(&status)) {
|
||||
ret = wuffs_base__status__message(&status);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src);
|
||||
if (status) {
|
||||
ret = status;
|
||||
if (!wuffs_base__status__is_ok(&status)) {
|
||||
ret = wuffs_base__status__message(&status);
|
||||
goto exit;
|
||||
}
|
||||
if (!wuffs_base__image_config__is_valid(&ic)) {
|
||||
@@ -107,8 +107,8 @@ const char* fuzz(wuffs_base__io_buffer* src, uint32_t hash) {
|
||||
|
||||
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
|
||||
status = wuffs_base__pixel_buffer__set_from_slice(&pb, &ic.pixcfg, pixbuf);
|
||||
if (status) {
|
||||
ret = status;
|
||||
if (!wuffs_base__status__is_ok(&status)) {
|
||||
ret = wuffs_base__status__message(&status);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
@@ -116,9 +116,9 @@ const char* fuzz(wuffs_base__io_buffer* src, uint32_t hash) {
|
||||
while (true) {
|
||||
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
|
||||
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src);
|
||||
if (status) {
|
||||
if ((status != wuffs_base__warning__end_of_data) || !seen_ok) {
|
||||
ret = status;
|
||||
if (!wuffs_base__status__is_ok(&status)) {
|
||||
if ((status.repr != wuffs_base__warning__end_of_data) || !seen_ok) {
|
||||
ret = wuffs_base__status__message(&status);
|
||||
}
|
||||
goto exit;
|
||||
}
|
||||
@@ -134,9 +134,9 @@ const char* fuzz(wuffs_base__io_buffer* src, uint32_t hash) {
|
||||
goto exit;
|
||||
}
|
||||
|
||||
if (status) {
|
||||
if ((status != wuffs_base__warning__end_of_data) || !seen_ok) {
|
||||
ret = status;
|
||||
if (!wuffs_base__status__is_ok(&status)) {
|
||||
if ((status.repr != wuffs_base__warning__end_of_data) || !seen_ok) {
|
||||
ret = wuffs_base__status__message(&status);
|
||||
}
|
||||
goto exit;
|
||||
}
|
||||
|
||||
@@ -62,11 +62,11 @@ uint8_t work_buffer[1];
|
||||
|
||||
const char* fuzz(wuffs_base__io_buffer* src, uint32_t hash) {
|
||||
wuffs_zlib__decoder dec;
|
||||
const char* status = wuffs_zlib__decoder__initialize(
|
||||
wuffs_base__status status = wuffs_zlib__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
(hash & 1) ? WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED : 0);
|
||||
if (status) {
|
||||
return status;
|
||||
if (!wuffs_base__status__is_ok(&status)) {
|
||||
return wuffs_base__status__message(&status);
|
||||
}
|
||||
|
||||
// Ignore the checksum for 99.99%-ish of all input. When fuzzers generate
|
||||
@@ -89,7 +89,7 @@ const char* fuzz(wuffs_base__io_buffer* src, uint32_t hash) {
|
||||
.ptr = work_buffer,
|
||||
.len = WORK_BUFFER_SIZE,
|
||||
}));
|
||||
if (status != wuffs_base__suspension__short_write) {
|
||||
if (status.repr != wuffs_base__suspension__short_write) {
|
||||
break;
|
||||
}
|
||||
if (dst.meta.wi == 0) {
|
||||
@@ -98,5 +98,5 @@ const char* fuzz(wuffs_base__io_buffer* src, uint32_t hash) {
|
||||
intentional_segfault();
|
||||
}
|
||||
}
|
||||
return status;
|
||||
return wuffs_base__status__message(&status);
|
||||
}
|
||||
Reference in new issue
Block a user