fix stupid direct return out of critical section

tom-pytel · tom-pytel · commit d0b17c6868f8 · 2025-03-03T07:04:41.000-05:00
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -814,10 +814,12 @@ getarrayitem_locked(PyObject *op, Py_ssize_t i)
     }
 #endif
     if (!valid_index(i, Py_SIZE(op)))  {
-        return NULL;
+        ret = NULL;
+    }
+    else {
+        arrayobject *ap = (arrayobject *)op;
+        ret = getarrayitem(op, i, ap->ob_item);
     }
-    arrayobject *ap = (arrayobject *)op;
-    ret = getarrayitem(op, i, ap->ob_item);
     Py_END_CRITICAL_SECTION();
     return ret;
 }
@@ -844,6 +846,8 @@ getarrayitem_maybe_locked(PyObject *op, Py_ssize_t i)
         return NULL;
     }
     return getarrayitem(op, i, items);
+    /* Could check size again here to make sure it hasn't changed during get,
+       but not sure would add anything of value. */
 }
 
 #else // Py_GIL_DISABLED

Original file line number	Diff line number	Diff line change
`@@ -814,10 +814,12 @@ getarrayitem_locked(PyObject *op, Py_ssize_t i)`
`814`	`814`	`}`
`815`	`815`	`#endif`
`816`	`816`	`if (!valid_index(i, Py_SIZE(op))) {`
`817`		`- return NULL;`
	`817`	`+ ret = NULL;`
	`818`	`+ }`
	`819`	`+ else {`
	`820`	`+ arrayobject ap = (arrayobject )op;`
	`821`	`+ ret = getarrayitem(op, i, ap->ob_item);`
`818`	`822`	`}`
`819`		`- arrayobject ap = (arrayobject )op;`
`820`		`- ret = getarrayitem(op, i, ap->ob_item);`
`821`	`823`	`Py_END_CRITICAL_SECTION();`
`822`	`824`	`return ret;`
`823`	`825`	`}`
`@@ -844,6 +846,8 @@ getarrayitem_maybe_locked(PyObject *op, Py_ssize_t i)`
`844`	`846`	`return NULL;`
`845`	`847`	`}`
`846`	`848`	`return getarrayitem(op, i, items);`
	`849`	`+ /* Could check size again here to make sure it hasn't changed during get,`
	`850`	`+ but not sure would add anything of value. */`
`847`	`851`	`}`
`848`	`852`
`849`	`853`	`#else // Py_GIL_DISABLED`