mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.12] gh-105375: Improve error handling in _elementtree (GH-105591) (#105600)

Browse source 
Fix bugs where exceptions could end up being overwritten.
(cherry picked from commit 00b599ab5a)

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
This commit is contained in:
Miss Islington (bot) 2023-06-09 14:15:24 -07:00 • committed by GitHub
parent e0087df65d
commit 411366ccdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Library/2023-06-09-21-25-14.gh-issue-105375.95g1eI.rst Normal file
View file

@ -0,0 +1 @@
Fix bugs in :mod:`!_elementtree` where exceptions could be overwritten.

10
Modules/_elementtree.c
View file

@ -3261,10 +3261,14 @@ expat_start_handler(XMLParserObject* self, const XML_Char* tag_in,
} }
while (attrib_in[0] && attrib_in[1]) { while (attrib_in[0] && attrib_in[1]) {
PyObject* key = makeuniversal(self, attrib_in[0]); PyObject* key = makeuniversal(self, attrib_in[0]);
if (key == NULL) {
Py_DECREF(attrib);
Py_DECREF(tag);
return;
}
PyObject* value = PyUnicode_DecodeUTF8(attrib_in[1], strlen(attrib_in[1]), "strict"); PyObject* value = PyUnicode_DecodeUTF8(attrib_in[1], strlen(attrib_in[1]), "strict");
if (!key || !value) { if (value == NULL) {
Py_XDECREF(value); Py_DECREF(key);
Py_XDECREF(key);
Py_DECREF(attrib); Py_DECREF(attrib);
Py_DECREF(tag); Py_DECREF(tag);
return; return;