diff options
| author | Daniël van de Giessen <daniel@dvdgiessen.nl> | 2020-08-27 14:16:48 +0200 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-03-08 23:16:14 +1100 |
| commit | e2513bfe8db91055e443e1804e3abb90c9998d86 (patch) | |
| tree | ee969a25d94145a083425b93ff543ed6effb95ca /extmod/moduzlib.c | |
| parent | e0b97013d0730a70d94922aca168f49b9f456e46 (diff) | |
| download | micropython-e2513bfe8db91055e443e1804e3abb90c9998d86.tar.gz micropython-e2513bfe8db91055e443e1804e3abb90c9998d86.zip | |
extmod/moduzlib: Fix parsing zlib header dict size.
From RFC 1950 section 2.2: "CINFO is the base-2 logarithm of the LZ77
window size, minus eight (CINFO=7 indicates a 32K window size)"
Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
Diffstat (limited to 'extmod/moduzlib.c')
| -rw-r--r-- | extmod/moduzlib.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c index f78c349085..a6874fb4e3 100644 --- a/extmod/moduzlib.c +++ b/extmod/moduzlib.c @@ -77,7 +77,7 @@ STATIC mp_obj_t decompio_make_new(const mp_obj_type_t *type, size_t n_args, size o->eof = false; mp_int_t dict_opt = 0; - int dict_sz; + uint dict_sz; if (n_args > 1) { dict_opt = mp_obj_get_int(args[1]); } @@ -94,7 +94,10 @@ STATIC mp_obj_t decompio_make_new(const mp_obj_type_t *type, size_t n_args, size header_error: mp_raise_ValueError(MP_ERROR_TEXT("compression header")); } - dict_sz = 1 << dict_opt; + // RFC 1950 section 2.2: + // CINFO is the base-2 logarithm of the LZ77 window size, + // minus eight (CINFO=7 indicates a 32K window size) + dict_sz = 1 << (dict_opt + 8); } else { dict_sz = 1 << -dict_opt; } @@ -116,6 +119,7 @@ STATIC mp_uint_t decompio_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *er o->eof = true; } if (st < 0) { + DEBUG_printf("uncompress error=" INT_FMT "\n", st); *errcode = MP_EINVAL; return MP_STREAM_ERROR; } |