From 8685c3e47866e03ab3f1cf723045654dc1f51f4a Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Sat, 9 Oct 2021 23:53:43 +0900 Subject: [PATCH] bpo-20028: Keep original exception when PyUnicode_GetLength return -1 --- Modules/_csv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Modules/_csv.c b/Modules/_csv.c index cfdfbce6e6824f..72f0791a4398b6 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -244,6 +244,9 @@ _set_char_or_none(const char *name, Py_UCS4 *target, PyObject *src, Py_UCS4 dflt return -1; } Py_ssize_t len = PyUnicode_GetLength(src); + if (len < 0) { + return -1; + } if (len > 1) { PyErr_Format(PyExc_TypeError, "\"%s\" must be a 1-character string", @@ -274,6 +277,9 @@ _set_char(const char *name, Py_UCS4 *target, PyObject *src, Py_UCS4 dflt) return -1; } Py_ssize_t len = PyUnicode_GetLength(src); + if (len < 0) { + return -1; + } if (len > 1) { PyErr_Format(PyExc_TypeError, "\"%s\" must be a 1-character string",