Fix null pointer dereferencing in structmember.c PyMember_SetOne() for T_CHAR. _PyUnicode_AsStringAndSize() can return NULL without touching the len argument. Also remove unnecessary PyUnicode_Check(), _PyUnicode_AsStringAndSize() performance the test again. CID 486815
diff --git a/Python/structmember.c b/Python/structmember.c
index ddedea5..af0296d 100644
--- a/Python/structmember.c
+++ b/Python/structmember.c
@@ -254,12 +254,8 @@
char *string;
Py_ssize_t len;
- if (!PyUnicode_Check(v)) {
- PyErr_BadArgument();
- return -1;
- }
string = _PyUnicode_AsStringAndSize(v, &len);
- if (len != 1) {
+ if (string == NULL || len != 1) {
PyErr_BadArgument();
return -1;
}