Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Critical fix: if cPickle on a sizeof(long)==8 box is used to read a 

binary pickle, and the latter contains a pickle of a negative Python
int i written on a sizeof(long)==4 box (and whether by cPickle or
pickle.py), it's read incorrectly as i + 2**32.  The patch repairs that,
and allows test_cpickle.py (to which I added a relevant test case earlier
today) to work again on sizeof(long)==8 boxes.
There's another (at least one) sizeof(long)==8 binary pickle bug, but in
pickle.py instead.  That bug is still there, and test_pickle.py doesn't
catch it yet (try pickling and unpickling, e.g., 1 << 46).
This commit is contained in:
Tim Peters 2001-04-10 01:54:42 +00:00
parent 4e6a7a626d
commit bfa18f711f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/cPickle.c
View File

@ -2528,7 +2528,14 @@ calc_binint(char *s, int x) {
c = (unsigned char)s[i];
l |= (long)c << (i * 8);
}
#if SIZEOF_LONG > 4
/* Unlike BININT1 and BININT2, BININT (more accurately BININT4)
* is signed, so on a box with longs bigger than 4 bytes we need
* to extend a BININT's sign bit to the full width.
*/
if (x == 4 && l & (1L << 31))
l |= (~0L) << 32;
#endif
return l;
}