Commit de7990b8 authored by Tim Peters's avatar Tim Peters

SF bug #1238681: freed pointer is used in longobject.c:long_pow().

In addition, long_pow() skipped a necessary (albeit extremely unlikely
to trigger) error check when converting an int modulus to long.

Alas, I was unable to write a test case that crashed due to either
cause.

Bugfix candidate.
parent f5f32b47
...@@ -12,6 +12,8 @@ What's New in Python 2.5 alpha 1? ...@@ -12,6 +12,8 @@ What's New in Python 2.5 alpha 1?
Core and builtins Core and builtins
----------------- -----------------
- SF bug #1238681: freed pointer is used in longobject.c:long_pow().
- SF bug #1229429: PyObject_CallMethod failed to decrement some - SF bug #1229429: PyObject_CallMethod failed to decrement some
reference counts in some error exit cases. reference counts in some error exit cases.
......
...@@ -2360,8 +2360,11 @@ long_pow(PyObject *v, PyObject *w, PyObject *x) ...@@ -2360,8 +2360,11 @@ long_pow(PyObject *v, PyObject *w, PyObject *x)
c = (PyLongObject *)x; c = (PyLongObject *)x;
Py_INCREF(x); Py_INCREF(x);
} }
else if (PyInt_Check(x)) else if (PyInt_Check(x)) {
c = (PyLongObject *)PyLong_FromLong(PyInt_AS_LONG(x)); c = (PyLongObject *)PyLong_FromLong(PyInt_AS_LONG(x));
if (c == NULL)
goto Error;
}
else if (x == Py_None) else if (x == Py_None)
c = NULL; c = NULL;
else { else {
...@@ -2511,14 +2514,14 @@ long_pow(PyObject *v, PyObject *w, PyObject *x) ...@@ -2511,14 +2514,14 @@ long_pow(PyObject *v, PyObject *w, PyObject *x)
} }
/* fall through */ /* fall through */
Done: Done:
Py_XDECREF(a);
Py_XDECREF(b);
Py_XDECREF(c);
Py_XDECREF(temp);
if (b->ob_size > FIVEARY_CUTOFF) { if (b->ob_size > FIVEARY_CUTOFF) {
for (i = 0; i < 32; ++i) for (i = 0; i < 32; ++i)
Py_XDECREF(table[i]); Py_XDECREF(table[i]);
} }
Py_DECREF(a);
Py_DECREF(b);
Py_XDECREF(c);
Py_XDECREF(temp);
return (PyObject *)z; return (PyObject *)z;
} }
......
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