Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

Fix a bug where 'tp_richcompare' could end up overwriting an exception.
This commit is contained in:
Erlend E. Aasland 2023-06-11 11:58:08 +02:00 committed by GitHub
parent 01f4230460
commit 35cff545db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS.d/next/Library/2023-06-09-21-46-52.gh-issue-105375.yrJelV.rst Normal file
View File

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

8
Modules/arraymodule.c
View File

@ -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);