From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 9 Jun 2023 21:15:24 +0000 (-0700)
Subject: [3.12] gh-105375: Improve error handling in _elementtree (GH-105591) (#105600)
X-Git-Tag: v3.12.0b3~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=411366ccdb7708cbf4e00db9186c2cffb3a0c652;p=thirdparty%2FPython%2Fcpython.git

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

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

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
---

diff --git a/Misc/NEWS.d/next/Library/2023-06-09-21-25-14.gh-issue-105375.95g1eI.rst b/Misc/NEWS.d/next/Library/2023-06-09-21-25-14.gh-issue-105375.95g1eI.rst
new file mode 100644
index 000000000000..1894b2b94bb3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-06-09-21-25-14.gh-issue-105375.95g1eI.rst
@@ -0,0 +1 @@
+Fix bugs in :mod:`!_elementtree` where exceptions could be overwritten.
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 00d9f647ccfd..6244fcc2064c 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -3261,10 +3261,14 @@ expat_start_handler(XMLParserObject* self, const XML_Char* tag_in,
         }
         while (attrib_in[0] && attrib_in[1]) {
             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");
-            if (!key || !value) {
-                Py_XDECREF(value);
-                Py_XDECREF(key);
+            if (value == NULL) {
+                Py_DECREF(key);
                 Py_DECREF(attrib);
                 Py_DECREF(tag);
                 return;