diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-10-06 00:06:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-06 00:06:53 -0700 |
| commit | 177254c96f9258a62e3e571c2aee0b642070a374 (patch) | |
| tree | 78436621244921b377c0b48934d47abe94de0536 | |
| parent | 22e86fbbca04d251233fc07515885d2b67945094 (diff) | |
| download | cpython-git-177254c96f9258a62e3e571c2aee0b642070a374.tar.gz | |
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>
| -rw-r--r-- | Misc/NEWS.d/next/C API/2018-10-05-17-06-49.bpo-34910.tSFrls.rst | 2 | ||||
| -rw-r--r-- | Objects/object.c | 5 |
2 files changed, 5 insertions, 2 deletions
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 0000000000..eff4755d8d --- /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 defff55796..fdd41a6168 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); |