summaryrefslogtreecommitdiff
path: root/Python/ceval.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2008-01-23 20:09:39 +0000
committerGuido van Rossum <guido@python.org>2008-01-23 20:09:39 +0000
commite105f980460131d192d955fca0df474bcf1c642c (patch)
treed728596ff034128a3dc73a2ecf20c102a55e4059 /Python/ceval.c
parent2529aa984082a11e7abac97d608bd91adc844dc2 (diff)
downloadcpython-git-e105f980460131d192d955fca0df474bcf1c642c.tar.gz
Fix two crashers (borrowed_ref_[34].py from the trunk).
Diffstat (limited to 'Python/ceval.c')
-rw-r--r--Python/ceval.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index 4f6b731f2b..06d524b275 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2036,6 +2036,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
"__import__ not found");
break;
}
+ Py_INCREF(x);
v = POP();
u = TOP();
if (PyInt_AsLong(u) != -1 || PyErr_Occurred())
@@ -2057,11 +2058,14 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
Py_DECREF(u);
if (w == NULL) {
u = POP();
+ Py_DECREF(x);
x = NULL;
break;
}
READ_TIMESTAMP(intr0);
- x = PyEval_CallObject(x, w);
+ v = x;
+ x = PyEval_CallObject(v, w);
+ Py_DECREF(v);
READ_TIMESTAMP(intr1);
Py_DECREF(w);
SET_TOP(x);