PublicArchive/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-05-08 13:40:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

gh-115733: Fix crash involving exhausted list iterator (#115740)

Browse Source 
* gh-115733: Fix crash involving exhausted iterator

* Add blurb
This commit is contained in:
Sam Gross
2024-02-20 15:18:44 -05:00
committed by GitHub
parent 494739e1f7
commit 520403ed4c
6 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Python/bytecodes.c
+2 -1
View File
@@ -2612,7 +2612,7 @@ dummy_func(
assert(Py_TYPE(iter) == &PyListIter_Type);
STAT_INC(FOR_ITER, hit);
PyListObject *seq = it->it_seq;
if ((size_t)it->it_index >= (size_t)PyList_GET_SIZE(seq)) {
if (seq == NULL || (size_t)it->it_index >= (size_t)PyList_GET_SIZE(seq)) {
it->it_index = -1;
#ifndef Py_GIL_DISABLED
if (seq != NULL) {
@@ -2633,6 +2633,7 @@ dummy_func(
_PyListIterObject *it = (_PyListIterObject *)iter;
assert(Py_TYPE(iter) == &PyListIter_Type);
PyListObject *seq = it->it_seq;
DEOPT_IF(seq == NULL);
DEOPT_IF((size_t)it->it_index >= (size_t)PyList_GET_SIZE(seq));
}
Python/executor_cases.c.h
Generated
+1
View File
@@ -2427,6 +2427,7 @@
_PyListIterObject *it = (_PyListIterObject *)iter;
assert(Py_TYPE(iter) == &PyListIter_Type);
PyListObject *seq = it->it_seq;
if (seq == NULL) goto deoptimize;
if ((size_t)it->it_index >= (size_t)PyList_GET_SIZE(seq)) goto deoptimize;
break;
}
Python/generated_cases.c.h
Generated
+1 -1
View File
@@ -2560,7 +2560,7 @@
assert(Py_TYPE(iter) == &PyListIter_Type);
STAT_INC(FOR_ITER, hit);
PyListObject *seq = it->it_seq;
if ((size_t)it->it_index >= (size_t)PyList_GET_SIZE(seq)) {
if (seq == NULL || (size_t)it->it_index >= (size_t)PyList_GET_SIZE(seq)) {
it->it_index = -1;
#ifndef Py_GIL_DISABLED
if (seq != NULL) {