diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:40 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:40 -0800 |
| commit | b2fa705fd3887c326e811c418469c784353027f4 (patch) | |
| tree | b3428f73de91453edbfd4df1a5d4a212d182eb44 /Modules/_io/stringio.c | |
| parent | 134e58fd3aaa2e91390041e143f3f0a21a60142b (diff) | |
| parent | b53654b6dbfce8318a7d4d1cdaddca7a7fec194b (diff) | |
| download | cpython-b2fa705fd3887c326e811c418469c784353027f4.tar.gz | |
Issue #29392: Prevent crash when passing invalid arguments into msvcrt module.
Diffstat (limited to 'Modules/_io/stringio.c')
| -rw-r--r-- | Modules/_io/stringio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c index 06b4144578..8542efd972 100644 --- a/Modules/_io/stringio.c +++ b/Modules/_io/stringio.c @@ -438,7 +438,7 @@ stringio_iternext(stringio *self) _PyIO_str_readline, NULL); if (line && !PyUnicode_Check(line)) { PyErr_Format(PyExc_IOError, - "readline() should have returned an str object, " + "readline() should have returned a str object, " "not '%.200s'", Py_TYPE(line)->tp_name); Py_DECREF(line); return NULL; @@ -708,7 +708,7 @@ _io_StringIO___init___impl(stringio *self, PyObject *value, Py_TYPE(newline_obj)->tp_name); return -1; } - newline = _PyUnicode_AsString(newline_obj); + newline = PyUnicode_AsUTF8(newline_obj); if (newline == NULL) return -1; } |