Check "sep" and "end" for stringness in Print().
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 1a91296..8d7147b 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1429,7 +1429,20 @@
if (file == NULL || file == Py_None)
file = PySys_GetObject("stdout");
- /* XXX Verify that sep and end are None, NULL or strings. */
+ if (sep && sep != Py_None && !PyString_Check(sep) &&
+ !PyUnicode_Check(sep)) {
+ PyErr_Format(PyExc_TypeError,
+ "sep must be None, str or unicode, not %.200s",
+ sep->ob_type->tp_name);
+ return NULL;
+ }
+ if (end && end != Py_None && !PyString_Check(end) &&
+ !PyUnicode_Check(end)) {
+ PyErr_Format(PyExc_TypeError,
+ "end must be None, str or unicode, not %.200s",
+ end->ob_type->tp_name);
+ return NULL;
+ }
for (i = 0; i < PyTuple_Size(args); i++) {
if (i > 0) {