From: Dong-hee Na <donghee.na@python.org>
Date: Sat, 9 Oct 2021 16:13:44 +0000 (+0900)
Subject: [3.9] bpo-20028: Keep original exception when PyUnicode_GetLength return -1 (GH-28832... 
X-Git-Tag: v3.9.8~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4fcb6fd3dcc4db23867c2fbd538189b8f221225;p=thirdparty%2FPython%2Fcpython.git

[3.9] bpo-20028: Keep original exception when PyUnicode_GetLength return -1 (GH-28832) (GH-28835)
---

diff --git a/Modules/_csv.c b/Modules/_csv.c
index 40a6361d2085..029f473ae874 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -246,6 +246,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",
@@ -276,6 +279,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",