diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-09-11 12:05:18 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-09-11 12:05:18 -0400 |
| commit | 787269797e92e44d3edeab5d8dd0436170748e7e (patch) | |
| tree | eacf0f5457e1098d4327db7b205209fd7bb4a7ce /Python/structmember.c | |
| parent | 6f3e5e48d37388f820642f3f71dcc8da4c79ad19 (diff) | |
| parent | e9a6d62d9fb6f0e88318a4279b54288b5ab08ee3 (diff) | |
| download | cpython-git-787269797e92e44d3edeab5d8dd0436170748e7e.tar.gz | |
merge heads
Diffstat (limited to 'Python/structmember.c')
| -rw-r--r-- | Python/structmember.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Python/structmember.c b/Python/structmember.c index ddedea5419..af0296d802 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -254,12 +254,8 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) 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; } |