mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 18:34:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix an out-of-bound index in pmerge() discovered by Zooko (SF bug

Browse Source 
645404).  I'm not 100% sure this is the right fix, so I'll keep the
bug report open for Samuele, but this fixes the index error and passes
the test suite (and I can't see why it *shouldn't* be the right fix
:-).
This commit is contained in:
Guido van Rossum 2002-12-31 16:33:01 +00:00
parent e29310a2b3
commit 768158c11b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Objects/typeobject.c
View File

@ -1067,7 +1067,8 @@ pmerge(PyObject *acc, PyObject* to_merge) {
}
for (j = 0; j < to_merge_size; j++) {
PyObject *j_lst = PyList_GET_ITEM(to_merge, j);
if (PyList_GET_ITEM(j_lst, remain[j]) == candidate) {
if (remain[j] < PyList_GET_SIZE(j_lst) &&
PyList_GET_ITEM(j_lst, remain[j]) == candidate) {
remain[j]++;
}
}