diff --git a/test/c/mimiclib/gif.c b/test/c/mimiclib/gif.c index b36e742e..2cb09e11 100644 --- a/test/c/mimiclib/gif.c +++ b/test/c/mimiclib/gif.c @@ -73,15 +73,19 @@ mimic_gif_decode(uint64_t* n_bytes_out, // further complicates supporting both versions 4 and 5 of giflib. That // commit was therefore rolled back. struct SavedImage* si = &f->SavedImages[i]; - size_t n = (size_t)(si->ImageDesc.Width) * (size_t)(si->ImageDesc.Height); - if (n > wuffs_base__io_buffer__writer_length(dst)) { - ret = "GIF image's pixel data won't fit in the dst buffer"; - goto cleanup1; - } - memmove(wuffs_base__io_buffer__writer_pointer(dst), si->RasterBits, n); - dst->meta.wi += n; + size_t num_src = + (size_t)(si->ImageDesc.Width) * (size_t)(si->ImageDesc.Height); if (n_bytes_out) { - *n_bytes_out += n; + *n_bytes_out += num_src; + } + if (dst) { + size_t num_dst = dst->data.len - dst->meta.wi; + if (num_dst < num_src) { + ret = "GIF image's pixel data won't fit in the dst buffer"; + goto cleanup1; + } + memmove(dst->data.ptr + dst->meta.wi, si->RasterBits, num_src); + dst->meta.wi += num_src; } } diff --git a/test/c/mimiclib/png.c b/test/c/mimiclib/png.c index a4249027..fb8752bb 100644 --- a/test/c/mimiclib/png.c +++ b/test/c/mimiclib/png.c @@ -20,6 +20,17 @@ mimic_png_decode(uint64_t* n_bytes_out, uint32_t wuffs_initialize_flags, wuffs_base__pixel_format pixfmt, wuffs_base__io_buffer* src) { + static uint8_t dst_fallback_array_u8[64 * 1024 * 1024]; + wuffs_base__io_buffer dst_fallback = ((wuffs_base__io_buffer){ + .data = ((wuffs_base__slice_u8){ + .ptr = dst_fallback_array_u8, + .len = 64 * 1024 * 1024, + }), + }); + if (!dst) { + dst = &dst_fallback; + } + const char* ret = NULL; png_image pi; diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index faf4081d..f172894c 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -1120,12 +1120,9 @@ do_bench_image_decode( uint64_t i; uint64_t iters = iters_unscaled * g_flags.iterscale; for (i = 0; i < iters; i++) { - wuffs_base__io_buffer dst = ((wuffs_base__io_buffer){ - .data = g_pixel_slice_u8, - }); src.meta.ri = src_ri; CHECK_STRING( - (*decode_func)(&n_bytes, &dst, wuffs_initialize_flags, pixfmt, &src)); + (*decode_func)(&n_bytes, NULL, wuffs_initialize_flags, pixfmt, &src)); } bench_finish(iters, n_bytes); return NULL;