mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 05:35:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

cPickle support for TUPLE[123]. Incidentally plugged several undetected

Browse source 
overflow holes in Pdata_grow().
This commit is contained in:
Tim Peters 2003-02-02 20:29:39 +00:00
parent 9af6968b90
commit 1d63c9f151
3 changed files with 250 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/pickle.py
View file

@ -621,8 +621,11 @@ class Pickler:
proto = self.proto
n = len(obj)
if n == 0 and proto:
write(EMPTY_TUPLE)
if n == 0:
if proto:
write(EMPTY_TUPLE)
else:
write(MARK + TUPLE)
return
save = self.save
@ -639,13 +642,13 @@ class Pickler:
self.memoize(obj)
return
# proto 0, or proto 1 and tuple isn't empty, or proto > 1 and tuple
# proto 0 or proto 1 and tuple isn't empty, or proto > 1 and tuple
# has more than 3 elements.
write(MARK)
for element in obj:
save(element)
if n and id(obj) in memo:
if id(obj) in memo:
# Subtle. d was not in memo when we entered save_tuple(), so
# the process of saving the tuple's elements must have saved
# the tuple itself: the tuple is recursive. The proper action
@ -660,10 +663,9 @@ class Pickler:
write(POP * (n+1) + get)
return
# No recursion (including the empty-tuple case for protocol 0).
# No recursion.
self.write(TUPLE)
if obj: # No need to memoize empty tuple
self.memoize(obj)
self.memoize(obj)
dispatch[TupleType] = save_tuple