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

miss-islington · ZackerySpytz · web-flow · commit 49fb49d6f576 · 2018-10-06T00:07:12.000-07:00
(cherry picked from commit ae62f01) Co-authored-by: Zackery Spytz <zspytz@gmail.com>
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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Ensure that :c:func:`PyObject_Print` always returns ``-1`` on error. Patch
	`2`	`+by Zackery Spytz.`