diff --git a/Misc/NEWS.d/next/C API/2018-10-05-17-06-49.bpo-34910.tSFrls.rst b/Misc/NEWS.d/next/C API/2018-10-05-17-06-49.bpo-34910.tSFrls.rst new file mode 100644 index 00000000000..eff4755d8d5 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2018-10-05-17-06-49.bpo-34910.tSFrls.rst @@ -0,0 +1,2 @@ +Ensure that :c:func:`PyObject_Print` always returns ``-1`` on error. Patch +by Zackery Spytz. diff --git a/Objects/object.c b/Objects/object.c index 220aa90bf59..5535b7ee7ec 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -376,8 +376,9 @@ PyObject_Print(PyObject *op, FILE *fp, int flags) else if (PyUnicode_Check(s)) { PyObject *t; t = PyUnicode_AsEncodedString(s, "utf-8", "backslashreplace"); - if (t == NULL) - ret = 0; + if (t == NULL) { + ret = -1; + } else { fwrite(PyBytes_AS_STRING(t), 1, PyBytes_GET_SIZE(t), fp);