[3.6] bpo-31411: Prevent raising a SystemError in case warnings.onceregistry is not a dictionary. (GH-3485). (#3494)
(cherry picked from commit 252033d50effa08046ac34fcc406bc99796ab88b)
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 6cfae77..2b04b90 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -94,6 +94,12 @@
return NULL;
return _once_registry;
}
+ if (!PyDict_Check(registry)) {
+ PyErr_SetString(PyExc_TypeError,
+ "warnings.onceregistry must be a dict");
+ Py_DECREF(registry);
+ return NULL;
+ }
Py_DECREF(_once_registry);
_once_registry = registry;
return registry;
@@ -449,7 +455,7 @@
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;
}