mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 20:28:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #25262. Added support for BINBYTES8 opcode in Python implementation of

Browse source 
unpickler.  Highest 32 bits of 64-bit size for BINUNICODE8 and BINBYTES8
opcodes no longer silently ignored on 32-bit platforms in C implementation.
This commit is contained in:
Serhiy Storchaka 2015-09-29 22:12:29 +03:00
commit 525faaeffc
4 changed files with 44 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/_pickle.c
View file

@ -4606,10 +4606,20 @@ static Py_ssize_t
calc_binsize(char *bytes, int nbytes)
{
unsigned char *s = (unsigned char *)bytes;
Py_ssize_t i;
int i;
size_t x = 0;
for (i = 0; i < nbytes && (size_t)i < sizeof(size_t); i++) {
if (nbytes > (int)sizeof(size_t)) {
/* Check for integer overflow. BINBYTES8 and BINUNICODE8 opcodes
* have 64-bit size that can't be represented on 32-bit platform.
*/
for (i = (int)sizeof(size_t); i < nbytes; i++) {
if (s[i])
return -1;
}
nbytes = (int)sizeof(size_t);
}
for (i = 0; i < nbytes; i++) {
x |= (size_t) s[i] << (8 * i);
}