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.

diff --git a/Python/ceval.c b/Python/ceval.c
index 3a462afbed0723b507d0c0a9f7cdc1ec9e781794..6c457e125c1405ff866570c27666ba0b28afa18b 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1742,8 +1742,10 @@ PyEval_EvalFrame(PyFrameObject *f)
                                             PyObject_REPR(w));
                                break;
                        }
-                       if (PyDict_CheckExact(v))
+                       if (PyDict_CheckExact(v)) {
                                x = PyDict_GetItem(v, w);
+                               Py_XINCREF(x);
+                       }
                        else {
                                x = PyObject_GetItem(v, w);
                                if (x == NULL && PyErr_Occurred()) {
@@ -1763,8 +1765,8 @@ PyEval_EvalFrame(PyFrameObject *f)
                                                break;
                                        }
                                }
+                               Py_INCREF(x);
                        }
-                       Py_INCREF(x);
                        PUSH(x);
                        continue;