Merge pull request #1480 from dhalbert/packinto-bug

struct.pack_into incorrect buffer size check
This commit is contained in:
Scott Shawcroft 2019-01-21 09:28:18 -08:00 committed by GitHub
commit 9e8d182fe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -124,8 +124,8 @@ void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte* end_p, size
char fmt_type = get_fmt_type(&fmt);
const mp_uint_t total_sz = shared_modules_struct_calcsize(fmt_in);
if (p + total_sz != end_p) {
mp_raise_msg_varg(&mp_type_RuntimeError, translate("unpack requires a buffer of %d bytes"), total_sz);
if (p + total_sz > end_p) {
mp_raise_RuntimeError(translate("buffer too small"));
}
size_t i;