summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-07-01 13:18:49 (GMT)
committerChristian Heimes <christian@cheimes.de>2013-07-01 13:18:49 (GMT)
commitbfafab1849a1f30ee69474a3d275bcaf17844970 (patch)
treeb2605aee7c35c25de9b408ca74d9174aa7282fda /Lib
parent04926aeb2f88c39a25505e4a0474c6fb735e0f46 (diff)
parenta24b4d260beafb5b45450ff46d7740bea8eaa4a9 (diff)
downloadcpython-bfafab1849a1f30ee69474a3d275bcaf17844970.zip
cpython-bfafab1849a1f30ee69474a3d275bcaf17844970.tar.gz
cpython-bfafab1849a1f30ee69474a3d275bcaf17844970.tar.bz2
Issue #18339: Negative ints keys in unpickler.memo dict no longer cause a
segfault inside the _pickle C extension.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_pickle.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index f52d4bd..e96fe52 100644
--- a/Lib/test/test_pickle.py
+++ b/Lib/test/test_pickle.py
@@ -115,6 +115,13 @@ if has_c_implementation:
pickler_class = _pickle.Pickler
unpickler_class = _pickle.Unpickler
+ def test_issue18339(self):
+ unpickler = self.unpickler_class(io.BytesIO())
+ self.assertRaises(TypeError, setattr, unpickler, "memo", object)
+ # used to cause a segfault
+ self.assertRaises(ValueError, setattr, unpickler, "memo", {-1: None})
+ unpickler.memo = {1: None}
+
class CDispatchTableTests(AbstractDispatchTableTests):
pickler_class = pickle.Pickler
def get_dispatch_table(self):