Remove io_{reader,writer} C types

This commit is contained in:
Nigel Tao committed 2019-07-06 17:23:34 +10:00
1 parent f34d189236
commit aa846d2dd7
17 files changed
+194 -302

No files matched your search

+2 -2
View File
@@ -27,7 +27,7 @@ void intentional_segfault() {
*intentional_segfault_ptr = 0;
}
const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash);
const char* fuzz(wuffs_base__io_buffer* src, uint32_t hash);
static const char* llvmFuzzerTestOneInput(const uint8_t* data, size_t size) {
// Hash input as per https://en.wikipedia.org/wiki/Jenkins_hash_function
@@ -55,7 +55,7 @@ static const char* llvmFuzzerTestOneInput(const uint8_t* data, size_t size) {
}),
});
const char* msg = fuzz(wuffs_base__io_buffer__reader(&src), hash);
const char* msg = fuzz(&src, hash);
if (msg && strstr(msg, "internal error:")) {
fprintf(stderr, "internal errors shouldn't occur: \"%s\"\n", msg);
intentional_segfault();
+4 -5
View File
@@ -48,7 +48,7 @@ It should print "PASS", amongst other information, and exit(0).
#include "../../../release/c/wuffs-unsupported-snapshot.c"
#include "../fuzzlib/fuzzlib.c"
const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
const char* fuzz(wuffs_base__io_buffer* src, uint32_t hash) {
const char* ret = NULL;
wuffs_base__slice_u8 pixbuf = ((wuffs_base__slice_u8){});
wuffs_base__slice_u8 workbuf = ((wuffs_base__slice_u8){});
@@ -67,7 +67,7 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
}
wuffs_base__image_config ic = ((wuffs_base__image_config){});
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src);
if (status) {
ret = status;
goto exit;
@@ -115,7 +115,7 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
bool seen_ok = false;
while (true) {
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src);
if (status) {
if ((status != wuffs_base__warning__end_of_data) || !seen_ok) {
ret = status;
@@ -123,8 +123,7 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
goto exit;
}
status = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader, workbuf,
NULL);
status = wuffs_gif__decoder__decode_frame(&dec, &pb, src, workbuf, NULL);
wuffs_base__rect_ie_u32 frame_rect =
wuffs_base__frame_config__bounds(&fc);
+2 -3
View File
@@ -60,7 +60,7 @@ uint8_t work_buffer[WORK_BUFFER_SIZE];
uint8_t work_buffer[1];
#endif
const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
const char* fuzz(wuffs_base__io_buffer* src, uint32_t hash) {
wuffs_zlib__decoder dec;
const char* status = wuffs_zlib__decoder__initialize(
&dec, sizeof dec, WUFFS_VERSION,
@@ -81,11 +81,10 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
.len = DST_BUFFER_SIZE,
}),
});
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(&dst);
while (true) {
dst.meta.wi = 0;
status = wuffs_zlib__decoder__decode_io_writer(&dec, dst_writer, src_reader,
status = wuffs_zlib__decoder__decode_io_writer(&dec, &dst, src,
((wuffs_base__slice_u8){
.ptr = work_buffer,
.len = WORK_BUFFER_SIZE,