In PyNumber_ToBase, changed from an assert to returning an error when PyObject_Index() returns something other than an int or long. It should never be possible to trigger this, as PyObject_Index checks to make sure it returns an int or long.
This commit is contained in:
parent
7adfad850a
commit
3f91437e5f
|
@ -1275,7 +1275,11 @@ PyNumber_ToBase(PyObject *n, int base)
|
||||||
else if (PyInt_Check(index))
|
else if (PyInt_Check(index))
|
||||||
res = _PyInt_Format((PyIntObject*)index, base, 1);
|
res = _PyInt_Format((PyIntObject*)index, base, 1);
|
||||||
else
|
else
|
||||||
assert("PyNumber_ToBase: not long or int");
|
/* It should not be possible to get here, as
|
||||||
|
PyNumber_Index already has a check for the same
|
||||||
|
condition */
|
||||||
|
PyErr_SetString(PyExc_ValueError, "PyNumber_ToBase: index not "
|
||||||
|
"int or long");
|
||||||
Py_DECREF(index);
|
Py_DECREF(index);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue