Mercurial > cpython-lru_cache-weakref
diff Python/bltinmodule.c @ 61718:846866aa0eb6
Issue #6697: Fix a crash if sys.stdin or sys.stdout encoding contain a surrogate
This is *very* unlikely :-)
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Wed, 19 May 2010 01:06:22 +0000 |
| parents | 47b4da86b9b9 |
| children | 2de9d4457082 |
line wrap: on
line diff
--- a/Python/bltinmodule.c Wed May 19 00:54:06 2010 +0000 +++ b/Python/bltinmodule.c Wed May 19 01:06:22 2010 +0000 @@ -1610,6 +1610,7 @@ char *prompt; char *s; PyObject *stdin_encoding; + char *stdin_encoding_str; PyObject *result; stdin_encoding = PyObject_GetAttrString(fin, "encoding"); @@ -1617,6 +1618,11 @@ /* stdin is a text stream, so it must have an encoding. */ return NULL; + stdin_encoding_str = _PyUnicode_AsString(stdin_encoding); + if (stdin_encoding_str == NULL) { + Py_DECREF(stdin_encoding); + return NULL; + } tmp = PyObject_CallMethod(fout, "flush", ""); if (tmp == NULL) PyErr_Clear(); @@ -1625,12 +1631,18 @@ if (promptarg != NULL) { PyObject *stringpo; PyObject *stdout_encoding; - stdout_encoding = PyObject_GetAttrString(fout, - "encoding"); + char *stdout_encoding_str; + stdout_encoding = PyObject_GetAttrString(fout, "encoding"); if (stdout_encoding == NULL) { Py_DECREF(stdin_encoding); return NULL; } + stdout_encoding_str = _PyUnicode_AsString(stdout_encoding); + if (stdout_encoding_str == NULL) { + Py_DECREF(stdin_encoding); + Py_DECREF(stdout_encoding); + return NULL; + } stringpo = PyObject_Str(promptarg); if (stringpo == NULL) { Py_DECREF(stdin_encoding); @@ -1638,7 +1650,7 @@ return NULL; } po = PyUnicode_AsEncodedString(stringpo, - _PyUnicode_AsString(stdout_encoding), NULL); + stdout_encoding_str, NULL); Py_DECREF(stdout_encoding); Py_DECREF(stringpo); if (po == NULL) { @@ -1676,10 +1688,7 @@ result = NULL; } else { - result = PyUnicode_Decode - (s, len-1, - _PyUnicode_AsString(stdin_encoding), - NULL); + result = PyUnicode_Decode(s, len-1, stdin_encoding_str, NULL); } } Py_DECREF(stdin_encoding);