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

Sat Oct 6 02:44:29 EDT 2018

https://github.com/python/cpython/commit/ae62f015240c9162773341a9922794e6b960779d
commit: ae62f015240c9162773341a9922794e6b960779d
branch: master
author: Zackery Spytz <zspytz at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2018年10月06日T09:44:25+03:00
summary:
bpo-34910: Ensure that PyObject_Print() always returns -1 on error. (GH-9733)
files:
A Misc/NEWS.d/next/C API/2018-10-05-17-06-49.bpo-34910.tSFrls.rst
M Objects/object.c

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 607f047d147d..ab1baa70d434 100644
--- 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)
- ret = 0;
+ if (t == NULL) {
+ ret = -1;
+ }
 else {
 fwrite(PyBytes_AS_STRING(t), 1,
 PyBytes_GET_SIZE(t), fp);
