pythongh-105375: Improve array.array exception handling (python#105594)

erlend-aasland · web-flow · commit 35cff545db7c · 2023-06-11T11:58:08.000+02:00
Fix a bug where 'tp_richcompare' could end up overwriting an exception.
diff --git a/Misc/NEWS.d/next/Library/2023-06-09-21-46-52.gh-issue-105375.yrJelV.rst b/Misc/NEWS.d/next/Library/2023-06-09-21-46-52.gh-issue-105375.yrJelV.rst
@@ -0,0 +1,2 @@
+Fix a bug in :class:`array.array` where an exception could end up being
+overwritten.
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -767,10 +767,12 @@ array_richcompare(PyObject *v, PyObject *w, int op)
     k = 1;
     for (i = 0; i < Py_SIZE(va) && i < Py_SIZE(wa); i++) {
         vi = getarrayitem(v, i);
+        if (vi == NULL) {
+            return NULL;
+        }
         wi = getarrayitem(w, i);
-        if (vi == NULL || wi == NULL) {
-            Py_XDECREF(vi);
-            Py_XDECREF(wi);
+        if (wi == NULL) {
+            Py_DECREF(vi);
             return NULL;
         }
         k = PyObject_RichCompareBool(vi, wi, Py_EQ);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix a bug in :class:`array.array` where an exception could end up being
	`2`	`+overwritten.`