[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#24552)
benjamin.peterson
python-checkins at python.org
Thu Jul 2 23:19:40 CEST 2015
https://hg.python.org/cpython/rev/32486bb59e7e
changeset: 96761:32486bb59e7e
parent: 96758:8f30776602b4
parent: 96760:24197b5f7126
user: Benjamin Peterson <benjamin at python.org>
date: Thu Jul 02 16:19:05 2015 -0500
summary:
merge 3.5 (#24552)
files:
Lib/test/pickletester.py | 12 ++++++++++++
Misc/NEWS | 2 ++
Modules/_pickle.c | 2 +-
3 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -1039,6 +1039,18 @@
self.assertEqual(B(x), B(y), detail)
self.assertEqual(x.__dict__, y.__dict__, detail)
+ def test_newobj_not_class(self):
+ # Issue 24552
+ global SimpleNewObj
+ save = SimpleNewObj
+ o = object.__new__(SimpleNewObj)
+ b = self.dumps(o, 4)
+ try:
+ SimpleNewObj = 42
+ self.assertRaises((TypeError, pickle.UnpicklingError), self.loads, b)
+ finally:
+ SimpleNewObj = save
+
# Register a type with copyreg, with extension code extcode. Pickle
# an object of that type. Check that the resulting pickle uses opcode
# (EXT[124]) under proto 2, and not in proto 1.
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,8 @@
Library
-------
+- Issue #24552: Fix use after free in an error case of the _pickle module.
+
- Issue #24514: tarfile now tolerates number fields consisting of only
whitespace.
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -5279,10 +5279,10 @@
if (!PyType_Check(cls)) {
Py_DECREF(kwargs);
Py_DECREF(args);
- Py_DECREF(cls);
PyErr_Format(st->UnpicklingError,
"NEWOBJ_EX class argument must be a type, not %.200s",
Py_TYPE(cls)->tp_name);
+ Py_DECREF(cls);
return -1;
}
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list