djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moduzlib: Align out buffer to block size; shrink when decompression done.

This commit is contained in:
Paul Sokolovsky 2015-01-28 02:29:38 +02:00
parent 2324f3ef29
commit e9995bdea2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extmod/moduzlib.c
View File

@ -63,8 +63,9 @@ STATIC mp_obj_t mod_uzlib_decompress(mp_uint_t n_args, const mp_obj_t *args) {
TINF_DATA *decomp = m_new_obj(TINF_DATA); TINF_DATA *decomp = m_new_obj(TINF_DATA);
DEBUG_printf("sizeof(TINF_DATA)=" UINT_FMT "\n", sizeof(*decomp)); DEBUG_printf("sizeof(TINF_DATA)=" UINT_FMT "\n", sizeof(*decomp));
decomp->destStart = m_new(byte, bufinfo.len); decomp->destSize = (bufinfo.len + 15) & ~15;
decomp->destSize = bufinfo.len; decomp->destStart = m_new(byte, decomp->destSize);
DEBUG_printf("uzlib: Initial out buffer: " UINT_FMT " bytes\n", decomp->destSize);
decomp->destGrow = mod_uzlib_grow_buf; decomp->destGrow = mod_uzlib_grow_buf;
decomp->source = bufinfo.buf; decomp->source = bufinfo.buf;
@ -78,7 +79,10 @@ STATIC mp_obj_t mod_uzlib_decompress(mp_uint_t n_args, const mp_obj_t *args) {
nlr_raise(mp_obj_new_exception_arg1(&mp_type_ValueError, MP_OBJ_NEW_SMALL_INT(st))); nlr_raise(mp_obj_new_exception_arg1(&mp_type_ValueError, MP_OBJ_NEW_SMALL_INT(st)));
} }
mp_obj_t res = mp_obj_new_bytearray_by_ref(decomp->dest - decomp->destStart, decomp->destStart); mp_uint_t final_sz = decomp->dest - decomp->destStart;
DEBUG_printf("uzlib: Resizing from " UINT_FMT " to final size: " UINT_FMT " bytes\n", decomp->destSize, final_sz);
decomp->destStart = (byte*)m_renew(byte, decomp->destStart, decomp->destSize, final_sz);
mp_obj_t res = mp_obj_new_bytearray_by_ref(final_sz, decomp->destStart);
m_del_obj(TINF_DATA, decomp); m_del_obj(TINF_DATA, decomp);
return res; return res;
} }