diff --git a/test/c/mimiclib/deflate-gzip-zlib.c b/test/c/mimiclib/deflate-gzip-zlib.c index 4c3a7406..600bfe01 100644 --- a/test/c/mimiclib/deflate-gzip-zlib.c +++ b/test/c/mimiclib/deflate-gzip-zlib.c @@ -83,6 +83,12 @@ const char* mimic_zlib_decode(wuffs_base__io_buffer* dst, return mimic_deflate_zlib_decode(dst, src, wlimit, rlimit, false); } +const char* mimic_zlib_decode_with_dictionary(wuffs_base__io_buffer* got, + wuffs_base__io_buffer* src, + wuffs_base__slice_u8 dictionary) { + return "miniz does not implement zlib dictionaries"; +} + #else // WUFFS_MIMICLIB_USE_MINIZ_INSTEAD_OF_ZLIB #include "zlib.h" @@ -138,6 +144,7 @@ typedef enum { const char* mimic_deflate_gzip_zlib_decode(wuffs_base__io_buffer* dst, wuffs_base__io_buffer* src, + wuffs_base__slice_u8* dictionary, uint64_t wlimit, uint64_t rlimit, zlib_flavor flavor) { @@ -207,6 +214,19 @@ const char* mimic_deflate_gzip_zlib_decode(wuffs_base__io_buffer* dst, if (i_err == Z_STREAM_END) { break; + } else if (i_err == Z_NEED_DICT) { + if (dictionary) { + int isd_err = + inflateSetDictionary(&z, dictionary->ptr, dictionary->len); + if (isd_err != Z_OK) { + ret = "inflateSetDictionary failed"; + goto cleanup1; + } + dictionary = NULL; + continue; + } + ret = "inflate failed (need dict)"; + goto cleanup1; } else if (i_err == Z_DATA_ERROR) { ret = "inflate failed (data error)"; goto cleanup1; @@ -231,7 +251,7 @@ const char* mimic_deflate_decode(wuffs_base__io_buffer* dst, uint32_t wuffs_initialize_flags, uint64_t wlimit, uint64_t rlimit) { - return mimic_deflate_gzip_zlib_decode(dst, src, wlimit, rlimit, + return mimic_deflate_gzip_zlib_decode(dst, src, NULL, wlimit, rlimit, zlib_flavor_raw); } @@ -240,7 +260,7 @@ const char* mimic_gzip_decode(wuffs_base__io_buffer* dst, uint32_t wuffs_initialize_flags, uint64_t wlimit, uint64_t rlimit) { - return mimic_deflate_gzip_zlib_decode(dst, src, wlimit, rlimit, + return mimic_deflate_gzip_zlib_decode(dst, src, NULL, wlimit, rlimit, zlib_flavor_gzip); } @@ -249,8 +269,15 @@ const char* mimic_zlib_decode(wuffs_base__io_buffer* dst, uint32_t wuffs_initialize_flags, uint64_t wlimit, uint64_t rlimit) { - return mimic_deflate_gzip_zlib_decode(dst, src, wlimit, rlimit, + return mimic_deflate_gzip_zlib_decode(dst, src, NULL, wlimit, rlimit, zlib_flavor_zlib); } +const char* mimic_zlib_decode_with_dictionary(wuffs_base__io_buffer* dst, + wuffs_base__io_buffer* src, + wuffs_base__slice_u8 dictionary) { + return mimic_deflate_gzip_zlib_decode(dst, src, &dictionary, UINT64_MAX, + UINT64_MAX, zlib_flavor_zlib); +} + #endif // WUFFS_MIMICLIB_USE_MINIZ_INSTEAD_OF_ZLIB diff --git a/test/c/std/zlib.c b/test/c/std/zlib.c index 93fa7b2d..c1b8c7e2 100644 --- a/test/c/std/zlib.c +++ b/test/c/std/zlib.c @@ -81,6 +81,17 @@ golden_test zlib_pi_gt = { .src_filename = "test/data/pi.txt.zlib", // }; +// This dictionary-using zlib-encoded data comes from +// https://play.golang.org/p/Jh9Wyp6PLID, also mentioned in the RAC spec. +const char* zlib_sheep_src_ptr = + "\x78\xf9\x0b\xe0\x02\x6e\x0a\x29\xcf\x87\x31\x01\x01\x00\x00\xff\xff\x18" + "\x0c\x03\xa8"; +const size_t zlib_sheep_src_len = 21; +const char* zlib_sheep_dict_ptr = " sheep.\n"; +const size_t zlib_sheep_dict_len = 8; +const char* zlib_sheep_want_ptr = "Two sheep.\n"; +const size_t zlib_sheep_want_len = 11; + // ---------------- Zlib Tests const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst, @@ -232,6 +243,26 @@ const char* test_mimic_zlib_decode_pi() { UINT64_MAX); } +const char* test_mimic_zlib_decode_sheep() { + CHECK_FOCUS(__func__); + wuffs_base__io_buffer got = ((wuffs_base__io_buffer){ + .data = global_got_slice, + }); + wuffs_base__io_buffer src = + make_io_buffer_from_string(zlib_sheep_src_ptr, zlib_sheep_src_len); + wuffs_base__slice_u8 dict = ((wuffs_base__slice_u8){ + .ptr = ((uint8_t*)(zlib_sheep_dict_ptr)), + .len = zlib_sheep_dict_len, + }); + const char* status = mimic_zlib_decode_with_dictionary(&got, &src, dict); + if (status) { + return status; + } + wuffs_base__io_buffer want = + make_io_buffer_from_string(zlib_sheep_want_ptr, zlib_sheep_want_len); + return check_io_buffers_equal("", &got, &want); +} + #endif // WUFFS_MIMIC // ---------------- Zlib Benches @@ -284,6 +315,7 @@ proc tests[] = { test_mimic_zlib_decode_midsummer, // test_mimic_zlib_decode_pi, // + test_mimic_zlib_decode_sheep, // #endif // WUFFS_MIMIC diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index 30a83897..b9adf414 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -354,6 +354,19 @@ int test_main(int argc, char** argv, proc* tests, proc* benches) { // WUFFS_INCLUDE_GUARD is where wuffs_base__foo_bar are defined. #ifdef WUFFS_INCLUDE_GUARD +wuffs_base__io_buffer make_io_buffer_from_string(const char* ptr, size_t len) { + return ((wuffs_base__io_buffer){ + .data = ((wuffs_base__slice_u8){ + .ptr = ((uint8_t*)(ptr)), + .len = len, + }), + .meta = ((wuffs_base__io_buffer_meta){ + .wi = len, + .closed = true, + }), + }); +} + wuffs_base__rect_ie_u32 make_rect_ie_u32(uint32_t x0, uint32_t y0, uint32_t x1,