diff options
| author |   Serhiy Storchaka <storchaka@gmail.com> | 2015-09-07 22:38:34 +0300 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-09-07 22:38:34 +0300 |
| commit | 3b1bc7828dff9c58031f60f9d603ca78cbba96ea (patch) | |
| tree | 9e68eff4768bcdb358fc21ac36998cf7bb4fbff2 /Modules/pyexpat.c | |
| parent | Issue #25018: Fixed testing shutil.make_archive() with relative base_name on (diff) | |
| parent | Issue #25019: Fixed a crash caused by setting non-string key of expat parser. (diff) | |
| download | cpython-3b1bc7828dff9c58031f60f9d603ca78cbba96ea.tar.gz cpython-3b1bc7828dff9c58031f60f9d603ca78cbba96ea.tar.bz2 cpython-3b1bc7828dff9c58031f60f9d603ca78cbba96ea.zip | |
Issue #25019: Fixed a crash caused by setting non-string key of expat parser.
Added additional tests for expat parser attributes.
Based on patch by John Leitch.
Diffstat (limited to 'Modules/pyexpat.c')
| -rw-r--r-- | Modules/pyexpat.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c index a43887e04c3..60f6443f523 100644 --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -1378,11 +1378,16 @@ static int xmlparse_setattro(xmlparseobject *self, PyObject *name, PyObject *v) { /* Set attribute 'name' to value 'v'. v==NULL means delete */ + if (!PyUnicode_Check(name)) { + PyErr_Format(PyExc_TypeError, + "attribute name must be string, not '%.200s'", + name->ob_type->tp_name); + return -1; + } if (v == NULL) { PyErr_SetString(PyExc_RuntimeError, "Cannot delete attribute"); return -1; } - assert(PyUnicode_Check(name)); if (PyUnicode_CompareWithASCIIString(name, "buffer_text") == 0) { int b = PyObject_IsTrue(v); if (b < 0) |