summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorOren Milman <orenmn@gmail.com>2017-09-11 21:18:09 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2017-09-11 21:18:09 (GMT)
commit9d984fd2b097c8c29479d1c3eb740995fe1ccb0d (patch)
treea7d7c86c389662a32c482863d5be1b074a7066af /Python
parent8239fd704637d7cbf59273883fbe487fc0f568fc (diff)
downloadcpython-9d984fd2b097c8c29479d1c3eb740995fe1ccb0d.zip
cpython-9d984fd2b097c8c29479d1c3eb740995fe1ccb0d.tar.gz
cpython-9d984fd2b097c8c29479d1c3eb740995fe1ccb0d.tar.bz2
bpo-31416: Fix assertion failures in case of a bad warnings.filters or warnings.defaultaction. (#3496)
Patch by Oren Milman.
Diffstat (limited to 'Python')
-rw-r--r--Python/_warnings.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 078bdcb..6dad080 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -110,7 +110,14 @@ get_default_action(void)
}
return _PyRuntime.warnings.default_action;
}
-
+ if (!PyUnicode_Check(default_action)) {
+ PyErr_Format(PyExc_TypeError,
+ MODULE_NAME ".defaultaction must be a string, "
+ "not '%.200s'",
+ Py_TYPE(default_action)->tp_name);
+ Py_DECREF(default_action);
+ return NULL;
+ }
Py_DECREF(_PyRuntime.warnings.default_action);
_PyRuntime.warnings.default_action = default_action;
return default_action;
@@ -164,6 +171,14 @@ get_filter(PyObject *category, PyObject *text, Py_ssize_t lineno,
mod = PyTuple_GET_ITEM(tmp_item, 3);
ln_obj = PyTuple_GET_ITEM(tmp_item, 4);
+ if (!PyUnicode_Check(action)) {
+ PyErr_Format(PyExc_TypeError,
+ "action must be a string, not '%.200s'",
+ Py_TYPE(action)->tp_name);
+ Py_DECREF(tmp_item);
+ return NULL;
+ }
+
good_msg = check_matched(msg, text);
if (good_msg == -1) {
Py_DECREF(tmp_item);
@@ -203,8 +218,6 @@ get_filter(PyObject *category, PyObject *text, Py_ssize_t lineno,
return action;
}
- PyErr_SetString(PyExc_ValueError,
- MODULE_NAME ".defaultaction not found");
return NULL;
}