commit c80f0b7aa1d90332d0069d3e85ee112d0c9da7f0
author Dong-hee Na <donghee.na@python.org> Sun Oct 10 01:13:21 2021 +0900
committer GitHub <noreply@github.com> Sun Oct 10 01:13:21 2021 +0900
tree 2ec83c9ba1f67eb69be3046aa3895ae4c0ee7fcf
parent 8772935765e7a4f04f7f561e37d0c0aee71d8030

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

Modules/_csv.c

diff --git a/Modules/_csv.c b/Modules/_csv.c
index cfdfbce..72f0791 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -244,6 +244,9 @@
                 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 @@
                 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",