From ca66d685272e965bd927dbf69e2834800fee76bc Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 17 May 2018 20:49:23 +1000 Subject: [PATCH] Call wuffs_base__image_buffer__set_from_slice --- example/gifplayer/gifplayer.c | 4 ++++ fuzz/c/std/gif_fuzzer.c | 4 ++++ test/c/std/gif.c | 12 ++++++++++++ 3 files changed, 20 insertions(+) diff --git a/example/gifplayer/gifplayer.c b/example/gifplayer/gifplayer.c index 832f165b..12c0ca4d 100644 --- a/example/gifplayer/gifplayer.c +++ b/example/gifplayer/gifplayer.c @@ -74,6 +74,7 @@ const char* play() { .ptr = src_buffer, .len = src_len, .wi = src_len, .closed = true}; wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); + wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); wuffs_base__image_config ic = {{0}}; wuffs_gif__status s = wuffs_gif__decoder__decode_config(&dec, &ic, src_reader); @@ -103,6 +104,9 @@ const char* play() { return "could not allocate print buffer"; } } + // TODO: check wuffs_base__image_buffer__set_from_slice errors? + wuffs_base__image_buffer__set_from_slice( + &ib, ic, ((wuffs_base__slice_u8){.ptr = dst_buffer, .len = dst_len})); if (!seen_num_loops) { seen_num_loops = true; diff --git a/fuzz/c/std/gif_fuzzer.c b/fuzz/c/std/gif_fuzzer.c index 3a7eca6b..148b1981 100644 --- a/fuzz/c/std/gif_fuzzer.c +++ b/fuzz/c/std/gif_fuzzer.c @@ -49,6 +49,7 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) { wuffs_gif__decoder dec; wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0); + wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); wuffs_base__image_config ic = {{0}}; s = wuffs_gif__decoder__decode_config(&dec, &ic, src_reader); if (s) { @@ -71,6 +72,9 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) { ret = "out of memory"; goto exit; } + // TODO: check wuffs_base__image_buffer__set_from_slice errors? + wuffs_base__image_buffer__set_from_slice( + &ib, ic, ((wuffs_base__slice_u8){.ptr = pixbuf, .len = pixbuf_size})); wuffs_base__io_buffer dst = {.ptr = (uint8_t*)(pixbuf), .len = pixbuf_size}; wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(&dst); diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 438567a5..995cba9c 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -359,6 +359,7 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst, wuffs_base__io_buffer* src) { wuffs_gif__decoder dec; wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0); + wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); wuffs_base__image_config ic = {{0}}; wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst); wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src); @@ -367,6 +368,9 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst, if (s) { return wuffs_gif__status__string(s); } + // TODO: check wuffs_base__image_buffer__set_from_slice errors? + wuffs_base__image_buffer__set_from_slice( + &ib, ic, wuffs_base__io_buffer__writable(dst)); while (true) { s = wuffs_gif__decoder__decode_frame(&dec, dst_writer, src_reader); if (s == WUFFS_GIF__SUSPENSION_END_OF_DATA) { @@ -394,6 +398,7 @@ bool do_test_wuffs_gif_decode(const char* filename, wuffs_gif__decoder dec; wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0); + wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); { wuffs_base__image_config ic = {{0}}; wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); @@ -428,6 +433,9 @@ bool do_test_wuffs_gif_decode(const char* filename, wuffs_base__image_config__num_loops(&ic)); return false; } + // TODO: check wuffs_base__image_buffer__set_from_slice errors? + wuffs_base__image_buffer__set_from_slice( + &ib, ic, wuffs_base__io_buffer__writable(&got)); } int num_iters = 0; @@ -573,6 +581,7 @@ bool do_test_wuffs_gif_decode_animated(const char* filename, wuffs_gif__decoder dec; wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0); + wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); wuffs_base__image_config ic = {{0}}; wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got); wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); @@ -590,6 +599,9 @@ bool do_test_wuffs_gif_decode_animated(const char* filename, wuffs_base__image_config__num_loops(&ic), want_num_loops); return false; } + // TODO: check wuffs_base__image_buffer__set_from_slice errors? + wuffs_base__image_buffer__set_from_slice( + &ib, ic, wuffs_base__io_buffer__writable(&got)); uint32_t i; for (i = 0; i < want_num_frames; i++) {