mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-20 00:32:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Issue #13774: json: Fix a SystemError when a bogus encoding is passed to

Browse source 
json.loads().
This commit is contained in:
Amaury Forgeot d'Arc 2012-01-13 22:53:25 +01:00
parent 44765e58b0
commit dee76e627d
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Modules/_json.c
View file

@ -1725,8 +1725,15 @@ scanner_init(PyObject *self, PyObject *args, PyObject *kwds)
Py_DECREF(s->encoding);
s->encoding = tmp;
}
if (s->encoding == NULL || !PyString_Check(s->encoding))
if (s->encoding == NULL)
goto bail;
if (!PyString_Check(s->encoding)) {
PyErr_Format(PyExc_TypeError,
"encoding must be a string, not %.80s",
Py_TYPE(s->encoding)->tp_name);
goto bail;
}
/* All of these will fail "gracefully" so we don't need to verify them */
s->strict = PyObject_GetAttrString(ctx, "strict");