mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-10 02:36:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source
This commit is contained in:
Dong-hee Na 2021-10-10 01:13:21 +09:00 • committed by GitHub
parent 8772935765
commit c80f0b7aa1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/_csv.c
View file

@ -244,6 +244,9 @@ _set_char_or_none(const char *name, Py_UCS4 *target, PyObject *src, Py_UCS4 dflt
return -1; return -1;
} }
Py_ssize_t len = PyUnicode_GetLength(src); Py_ssize_t len = PyUnicode_GetLength(src);
if (len < 0) {
return -1;
}
if (len > 1) { if (len > 1) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"\"%s\" must be a 1-character string", "\"%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; return -1;
} }
Py_ssize_t len = PyUnicode_GetLength(src); Py_ssize_t len = PyUnicode_GetLength(src);
if (len < 0) {
return -1;
}
if (len > 1) { if (len > 1) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"\"%s\" must be a 1-character string", "\"%s\" must be a 1-character string",