bpo-34910: Ensure that PyObject_Print() always returns -1 on error. (GH-9733)

ae62f015 · Zackery Spytz · Serhiy Storchaka · cd45385f · ae62f015 · ae62f015
Commit ae62f015 authored Oct 06, 2018 by Zackery Spytz Committed by Serhiy Storchaka Oct 06, 2018
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Misc/NEWS.d/next/C API/2018-10-05-17-06-49.bpo-34910.tSFrls.rst ...EWS.d/next/C API/2018-10-05-17-06-49.bpo-34910.tSFrls.rst +2 -0

Objects/object.c Objects/object.c +3 -2

No files found.
--- 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
+Ensure that :c:func:`PyObject_Print` always returns ``-1`` on error.  Patch
+by Zackery Spytz.
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -375,8 +375,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)
+                if (t == NULL) {
-                    ret = 0;
+                    ret = -1;
+                }
                else {
                    fwrite(PyBytes_AS_STRING(t), 1,
                           PyBytes_GET_SIZE(t), fp);