traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #29190: Fixed possible errors in comparing strings in the pickle module.

This commit is contained in:
Serhiy Storchaka 2017-01-09 10:04:34 +02:00
parent 959ff7f1c6
commit 9937d90ee8
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/_pickle.c
View File

@ -1548,9 +1548,9 @@ memo_put(PicklerObject *self, PyObject *obj)
} }
static PyObject * static PyObject *
get_dotted_path(PyObject *obj, PyObject *name) { get_dotted_path(PyObject *obj, PyObject *name)
{
_Py_static_string(PyId_dot, "."); _Py_static_string(PyId_dot, ".");
_Py_static_string(PyId_locals, "<locals>");
PyObject *dotted_path; PyObject *dotted_path;
Py_ssize_t i, n; Py_ssize_t i, n;
@ -1561,12 +1561,7 @@ get_dotted_path(PyObject *obj, PyObject *name) {
assert(n >= 1); assert(n >= 1);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
PyObject *subpath = PyList_GET_ITEM(dotted_path, i); PyObject *subpath = PyList_GET_ITEM(dotted_path, i);
PyObject *result = PyUnicode_RichCompare( if (_PyUnicode_EqualToASCIIString(subpath, "<locals>")) {
subpath, _PyUnicode_FromId(&PyId_locals), Py_EQ);
int is_equal = (result == Py_True);
assert(PyBool_Check(result));
Py_DECREF(result);
if (is_equal) {
if (obj == NULL) if (obj == NULL)
PyErr_Format(PyExc_AttributeError, PyErr_Format(PyExc_AttributeError,
"Can't pickle local object %R", name); "Can't pickle local object %R", name);
@ -3537,13 +3532,12 @@ save_reduce(PicklerObject *self, PyObject *args, PyObject *obj)
else if (PyUnicode_Check(name)) { else if (PyUnicode_Check(name)) {
if (self->proto >= 4) { if (self->proto >= 4) {
_Py_IDENTIFIER(__newobj_ex__); _Py_IDENTIFIER(__newobj_ex__);
use_newobj_ex = PyUnicode_Compare( use_newobj_ex = _PyUnicode_EqualToASCIIId(
name, _PyUnicode_FromId(&PyId___newobj_ex__)) == 0; name, &PyId___newobj_ex__);
} }
if (!use_newobj_ex) { if (!use_newobj_ex) {
_Py_IDENTIFIER(__newobj__); _Py_IDENTIFIER(__newobj__);
use_newobj = PyUnicode_Compare( use_newobj = _PyUnicode_EqualToASCIIId(name, &PyId___newobj__);
name, _PyUnicode_FromId(&PyId___newobj__)) == 0;
} }
} }
Py_XDECREF(name); Py_XDECREF(name);