[Python-checkins] bpo-31411: Prevent raising a SystemError in case warnings.onceregistry is not a dictionary. (#3485)
Serhiy Storchaka
webhook-mailer at python.org
Mon Sep 11 02:28:42 EDT 2017
https://github.com/python/cpython/commit/252033d50effa08046ac34fcc406bc99796ab88b
commit: 252033d50effa08046ac34fcc406bc99796ab88b
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-09-11T09:28:39+03:00
summary:
bpo-31411: Prevent raising a SystemError in case warnings.onceregistry is not a dictionary. (#3485)
files:
A Misc/NEWS.d/next/Core and Builtins/2017-09-11-08-50-41.bpo-31411.HZz82I.rst
M Lib/test/test_warnings/__init__.py
M Python/_warnings.c
diff --git a/Lib/test/test_warnings/__init__.py b/Lib/test/test_warnings/__init__.py
index 69623c40f46..75539cf1c87 100644
--- a/Lib/test/test_warnings/__init__.py
+++ b/Lib/test/test_warnings/__init__.py
@@ -794,6 +794,17 @@ def test_stderr_none(self):
self.assertNotIn(b'Warning!', stderr)
self.assertNotIn(b'Error', stderr)
+ @support.cpython_only
+ def test_issue31411(self):
+ # warn_explicit() shouldn't raise a SystemError in case
+ # warnings.onceregistry isn't a dictionary.
+ wmod = self.module
+ with original_warnings.catch_warnings(module=wmod):
+ wmod.filterwarnings('once')
+ with support.swap_attr(wmod, 'onceregistry', None):
+ with self.assertRaises(TypeError):
+ wmod.warn_explicit('foo', Warning, 'bar', 1, registry=None)
+
class WarningsDisplayTests(BaseTest):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-11-08-50-41.bpo-31411.HZz82I.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-11-08-50-41.bpo-31411.HZz82I.rst
new file mode 100644
index 00000000000..ad1b4b8870a
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-11-08-50-41.bpo-31411.HZz82I.rst
@@ -0,0 +1,2 @@
+Raise a TypeError instead of SystemError in case warnings.onceregistry is
+not a dictionary. Patch by Oren Milman.
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 5230318788c..078bdcb0399 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -86,6 +86,12 @@ get_once_registry(void)
return NULL;
return _PyRuntime.warnings.once_registry;
}
+ if (!PyDict_Check(registry)) {
+ PyErr_SetString(PyExc_TypeError,
+ "warnings.onceregistry must be a dict");
+ Py_DECREF(registry);
+ return NULL;
+ }
Py_DECREF(_PyRuntime.warnings.once_registry);
_PyRuntime.warnings.once_registry = registry;
return registry;
@@ -437,7 +443,7 @@ warn_explicit(PyObject *category, PyObject *message,
Py_RETURN_NONE;
if (registry && !PyDict_Check(registry) && (registry != Py_None)) {
- PyErr_SetString(PyExc_TypeError, "'registry' must be a dict");
+ PyErr_SetString(PyExc_TypeError, "'registry' must be a dict or None");
return NULL;
}
More information about the Python-checkins
mailing list