-
-
Notifications
You must be signed in to change notification settings - Fork 8.4k
py/objint: Fix int.to_bytes() buffer size checks. #13087
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -421,29 +421,50 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_from_bytes_fun_obj, 3, 4, int_fro | |
static MP_DEFINE_CONST_CLASSMETHOD_OBJ(int_from_bytes_obj, MP_ROM_PTR(&int_from_bytes_fun_obj)); | ||
|
||
static mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) { | ||
// TODO: Support signed param (assumes signed=False) | ||
// TODO: Support signed (currently behaves as if signed=(val < 0)) | ||
(void)n_args; | ||
bool overflow; | ||
|
||
mp_int_t len = mp_obj_get_int(args[1]); | ||
if (len < 0) { | ||
mp_int_t dlen = mp_obj_get_int(args[1]); | ||
if (dlen < 0) { | ||
mp_raise_ValueError(NULL); | ||
} | ||
bool big_endian = args[2] != MP_OBJ_NEW_QSTR(MP_QSTR_little); | ||
|
||
vstr_t vstr; | ||
vstr_init_len(&vstr, len); | ||
vstr_init_len(&vstr, dlen); | ||
byte *data = (byte *)vstr.buf; | ||
memset(data, 0, len); | ||
|
||
#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE | ||
if (!mp_obj_is_small_int(args[0])) { | ||
mp_obj_int_to_bytes_impl(args[0], big_endian, len, data); | ||
overflow = !mp_obj_int_to_bytes_impl(args[0], big_endian, dlen, data); | ||
} else | ||
#endif | ||
{ | ||
mp_int_t val = MP_OBJ_SMALL_INT_VALUE(args[0]); | ||
size_t l = MIN((size_t)len, sizeof(val)); | ||
mp_binary_set_int(l, big_endian, data + (big_endian ? (len - l) : 0), val); | ||
int slen = 0; // Number of bytes to represent val | ||
|
||
// This logic has a twin in objint_longlong.c | ||
if (val > 0) { | ||
slen = (sizeof(mp_int_t) * 8 - mp_clz_mpi(val) + 7) / 8; | ||
} else if (val < -1) { | ||
slen = (sizeof(mp_int_t) * 8 - mp_clz_mpi(~val) + 8) / 8; | ||
} else { | ||
// clz of 0 is defined, so 0 and -1 map to 0 and 1 | ||
slen = -val; | ||
} | ||
|
||
if (slen <= dlen) { | ||
memset(data, val < 0 ? 0xFF : 0x00, dlen); | ||
mp_binary_set_int(slen, big_endian, data + (big_endian ? (dlen - slen) : 0), val); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For later consideration (not this PR): can mp_binary_set_val and this function be combined to save size? |
||
overflow = false; | ||
} else { | ||
overflow = true; | ||
} | ||
} | ||
|
||
if (overflow) { | ||
mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("buffer too small")); | ||
} | ||
|
||
return mp_obj_new_bytes_from_vstr(&vstr); | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't really like this approach but it seems the least bad that works across all configurations and isn't too intrusive.
The other way I thought to do it was to only define
mp_clz32()
andmp_clz64()
and then have each port defineMP_SIZEOF_INT
or a similar macro.