diff options
| author | Guido van Rossum <guido@python.org> | 2008-01-23 20:19:01 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2008-01-23 20:19:01 (GMT) |
| commit | 1d9a9eaa89e166d814eb55acc1d6271087fadc83 (patch) | |
| tree | 9f80971b606f077119a32bd2fd5a51e3c1910f0d /Python | |
| parent | b2302ba9771d3c2795ae6c78d881b0c4715e2f63 (diff) | |
| download | cpython-1d9a9eaa89e166d814eb55acc1d6271087fadc83.zip cpython-1d9a9eaa89e166d814eb55acc1d6271087fadc83.tar.gz cpython-1d9a9eaa89e166d814eb55acc1d6271087fadc83.tar.bz2 | |
Fix two crashers.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/bltinmodule.c | 7 | ||||
| -rw-r--r-- | Python/ceval.c | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 9a31356..444fc1e 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1245,11 +1245,14 @@ min_max(PyObject *args, PyObject *kwds, int op) "%s() got an unexpected keyword argument", name); return NULL; } + Py_INCREF(keyfunc); } it = PyObject_GetIter(v); - if (it == NULL) + if (it == NULL) { + Py_XDECREF(keyfunc); return NULL; + } maxitem = NULL; /* the result */ maxval = NULL; /* the value associated with the result */ @@ -1298,6 +1301,7 @@ min_max(PyObject *args, PyObject *kwds, int op) else Py_DECREF(maxval); Py_DECREF(it); + Py_XDECREF(keyfunc); return maxitem; Fail_it_item_and_val: @@ -1308,6 +1312,7 @@ Fail_it: Py_XDECREF(maxval); Py_XDECREF(maxitem); Py_DECREF(it); + Py_XDECREF(keyfunc); return NULL; } diff --git a/Python/ceval.c b/Python/ceval.c index 5433b88..3e0ff76 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2066,6 +2066,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()) @@ -2087,11 +2088,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); |