Skip to content

bpo-31311: fix a SystemError and a crash in PyCData_setstate(), in case of a bad __dict__ #3254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 7 commits into from
Sep 25, 2017
Merged

bpo-31311: fix a SystemError and a crash in PyCData_setstate(), in case of a bad __dict__ #3254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c235bef
init commit
orenmn Aug 31, 2017
90ec8ea
add cpython_only decorator to the test
orenmn Aug 31, 2017
ef647b3
add a NEWS.d item
orenmn Aug 31, 2017
8f39945
Merge branch 'master' into bpo31311-fix-crash-and-SystemError
orenmn Sep 25, 2017
18e3903
specify actual type of mydict, and make the test more realistic
orenmn Sep 25, 2017
c4bced5
fix ref leak
orenmn Sep 25, 2017
c2988d8
add the actual type of 'myself' to the error message
orenmn Sep 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions Lib/ctypes/test/test_parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import unittest
from ctypes.test import need_symbol
import test.support

class SimpleTypesTestCase(unittest.TestCase):

Expand Down Expand Up @@ -180,6 +181,26 @@ def test_abstract(self):
self.assertRaises(TypeError, _Pointer.from_param, 42)
self.assertRaises(TypeError, _SimpleCData.from_param, 42)

@test.support.cpython_only
def test_issue31311(self):
# __setstate__ should neither raise a SystemError nor crash in case
# of a bad __dict__.
from ctypes import Structure

class BadStruct(Structure):
@property
def __dict__(self):
pass
with self.assertRaises(TypeError):
BadStruct().__setstate__({}, b'foo')

class WorseStruct(Structure):
@property
def __dict__(self):
1/0
with self.assertRaises(ZeroDivisionError):
WorseStruct().__setstate__({}, b'foo')

################################################################

if __name__ == '__main__':
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2017-08-31-17-52-56.bpo-31311.bNE2l-.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a crash in the ``__setstate__()`` method of `ctypes._CData`, in case of
a bad ``__dict__``. Patch by Oren Milman.
10 changes: 10 additions & 0 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2674,6 +2674,16 @@ PyCData_setstate(PyObject *myself, PyObject *args)
len = self->b_size;
memmove(self->b_ptr, data, len);
mydict = PyObject_GetAttrString(myself, "__dict__");
if (mydict == NULL) {
return NULL;
}
if (!PyDict_Check(mydict)) {
PyErr_Format(PyExc_TypeError,
"%.200s.__dict__ must be a dictionary, not %.200s",
Py_TYPE(myself)->tp_name, Py_TYPE(mydict)->tp_name);
Py_DECREF(mydict);
return NULL;
}
res = PyDict_Update(mydict, dict);
Py_DECREF(mydict);
if (res == -1)
Expand Down