mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Raise OverflowError when appropriate on long->float conversion. Most of

Browse source 
the fiddling is simply due to that no caller of PyLong_AsDouble ever
checked for failure (so that's fixing old bugs).  PyLong_AsDouble is much
faster for big inputs now too, but that's more of a happy consequence
than a design goal.
This commit is contained in:
Tim Peters 2001-09-04 05:14:19 +00:00
parent 1832de4bc0
commit 9fffa3eea3
5 changed files with 76 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Objects/complexobject.c
View file

@ -522,6 +522,8 @@ complex_coerce(PyObject **pv, PyObject **pw)
}
else if (PyLong_Check(*pw)) {
cval.real = PyLong_AsDouble(*pw);
if (cval.real == -1.0 && PyErr_Occurred())
return -1;
*pw = PyComplex_FromCComplex(cval);
Py_INCREF(*pv);
return 0;

11
Objects/floatobject.c
View file

@ -271,18 +271,19 @@ PyFloat_AsStringEx(char *buf, PyFloatObject *v, int precision)
return obj;
static int
convert_to_double(PyObject **v,
double *dbl)
convert_to_double(PyObject **v, double *dbl)
{
register PyObject *obj = *v;
if (PyInt_Check(obj)) {
*dbl = (double)PyInt_AS_LONG(obj);
}
else if (PyLong_Check(obj)) {
PyFPE_START_PROTECT("convert_to_double", {*v=NULL;return -1;})
*dbl = PyLong_AsDouble(obj);
PyFPE_END_PROTECT(*dbl)
if (*dbl == -1.0 && PyErr_Occurred()) {
*v = NULL;
return -1;
}
}
else {
Py_INCREF(Py_NotImplemented);

37
Objects/longobject.c
View file

@ -531,27 +531,28 @@ _PyLong_AsScaledDouble(PyObject *vv, int *exponent)
double
PyLong_AsDouble(PyObject *vv)
{
register PyLongObject *v;
int e;
double x;
double multiplier = (double) (1L << SHIFT);
int i, sign;
if (vv == NULL || !PyLong_Check(vv)) {
PyErr_BadInternalCall();
return -1;
}
v = (PyLongObject *)vv;
i = v->ob_size;
sign = 1;
x = 0.0;
if (i < 0) {
sign = -1;
i = -(i);
}
while (--i >= 0) {
x = x*multiplier + (double)v->ob_digit[i];
}
return x * sign;
x = _PyLong_AsScaledDouble(vv, &e);
if (x == -1.0 && PyErr_Occurred())
return -1.0;
if (e > INT_MAX / SHIFT)
goto overflow;
errno = 0;
x = ldexp(x, e * SHIFT);
if (errno == ERANGE)
goto overflow;
return x;
overflow:
PyErr_SetString(PyExc_OverflowError,
"long int too large to convert to float");
return -1.0;
}
/* Create a new long (or int) object from a C pointer */
@ -2098,9 +2099,9 @@ static PyObject *
long_float(PyObject *v)
{
double result;
PyFPE_START_PROTECT("long_float", return 0)
result = PyLong_AsDouble(v);
PyFPE_END_PROTECT(result)
if (result == -1.0 && PyErr_Occurred())
return NULL;
return PyFloat_FromDouble(result);
}