Commit a3711f73 authored by Michael W. Hudson's avatar Michael W. Hudson

Fix for the unfortunate fact that PyDict_GetItem and PyObject_GetItem

have differing refcount semantics.  If anyone sees a prettier way to
acheive the same ends, then please go for it.

I think this is the first time I've ever used Py_XINCREF.
parent 77a602fb
...@@ -1742,8 +1742,10 @@ PyEval_EvalFrame(PyFrameObject *f) ...@@ -1742,8 +1742,10 @@ PyEval_EvalFrame(PyFrameObject *f)
PyObject_REPR(w)); PyObject_REPR(w));
break; break;
} }
if (PyDict_CheckExact(v)) if (PyDict_CheckExact(v)) {
x = PyDict_GetItem(v, w); x = PyDict_GetItem(v, w);
Py_XINCREF(x);
}
else { else {
x = PyObject_GetItem(v, w); x = PyObject_GetItem(v, w);
if (x == NULL && PyErr_Occurred()) { if (x == NULL && PyErr_Occurred()) {
...@@ -1763,8 +1765,8 @@ PyEval_EvalFrame(PyFrameObject *f) ...@@ -1763,8 +1765,8 @@ PyEval_EvalFrame(PyFrameObject *f)
break; break;
} }
} }
}
Py_INCREF(x); Py_INCREF(x);
}
PUSH(x); PUSH(x);
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment