mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

SF patch 419176 from MvL; fixed bug 418977

Browse source 
Two errors in dict_to_map() helper used by PyFrame_LocalsToFast().
This commit is contained in:
Jeremy Hylton 2001-05-08 04:08:59 +00:00
parent d37292bb8d
commit 4c889011db
3 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Objects/frameobject.c
View file

@ -283,12 +283,9 @@ dict_to_map(PyObject *map, int nmap, PyObject *dict, PyObject **values,
PyObject *value = PyDict_GetItem(dict, key);
Py_XINCREF(value);
if (deref) {
if (value) {
if (value || clear) {
if (PyCell_Set(values[j], value) < 0)
PyErr_Clear();
} else if (clear) {
Py_XDECREF(values[j]);
values[j] = value;
}
} else if (value != NULL || clear) {
Py_XDECREF(values[j]);
@ -370,10 +367,10 @@ PyFrame_LocalsToFast(PyFrameObject *f, int clear)
return;
dict_to_map(f->f_code->co_cellvars,
PyTuple_GET_SIZE(f->f_code->co_cellvars),
locals, fast, 1, clear);
locals, fast + f->f_nlocals, 1, clear);
dict_to_map(f->f_code->co_freevars,
PyTuple_GET_SIZE(f->f_code->co_freevars),
locals, fast, 1, clear);
locals, fast + f->f_nlocals + f->f_ncells, 1, clear);
}
PyErr_Restore(error_type, error_value, error_traceback);
}