From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 6 Oct 2018 07:06:53 +0000 (-0700)
Subject: bpo-34910: Ensure that PyObject_Print() always returns -1 on error. (GH-9733)
X-Git-Tag: v3.6.7rc2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=177254c96f9258a62e3e571c2aee0b642070a374;p=thirdparty%2FPython%2Fcpython.git

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

(cherry picked from commit ae62f015240c9162773341a9922794e6b960779d)

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
new file mode 100644
index 000000000000..eff4755d8d5e
--- /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 defff5579699..fdd41a61681f 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -387,8 +387,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);