Browse Source

bpo-31406: Fix crash due to lack of type checking in subclassing. (#3477)

pull/3476/merge
Stefan Krah 8 years ago
committed by GitHub
parent
commit
3cedf46cdb
  1. 19
      Modules/_decimal/_decimal.c

19
Modules/_decimal/_decimal.c

@ -2082,13 +2082,17 @@ dec_from_long(PyTypeObject *type, const PyObject *v,
/* Return a new PyDecObject from a PyLongObject. Use the context for
conversion. */
static PyObject *
PyDecType_FromLong(PyTypeObject *type, const PyObject *pylong,
PyObject *context)
PyDecType_FromLong(PyTypeObject *type, const PyObject *v, PyObject *context)
{
PyObject *dec;
uint32_t status = 0;
dec = dec_from_long(type, pylong, CTX(context), &status);
if (!PyLong_Check(v)) {
PyErr_SetString(PyExc_TypeError, "argument must be an integer");
return NULL;
}
dec = dec_from_long(type, v, CTX(context), &status);
if (dec == NULL) {
return NULL;
}
@ -2104,15 +2108,20 @@ PyDecType_FromLong(PyTypeObject *type, const PyObject *pylong,
/* Return a new PyDecObject from a PyLongObject. Use a maximum context
for conversion. If the conversion is not exact, set InvalidOperation. */
static PyObject *
PyDecType_FromLongExact(PyTypeObject *type, const PyObject *pylong,
PyDecType_FromLongExact(PyTypeObject *type, const PyObject *v,
PyObject *context)
{
PyObject *dec;
uint32_t status = 0;
mpd_context_t maxctx;
if (!PyLong_Check(v)) {
PyErr_SetString(PyExc_TypeError, "argument must be an integer");
return NULL;
}
mpd_maxcontext(&maxctx);
dec = dec_from_long(type, pylong, &maxctx, &status);
dec = dec_from_long(type, v, &maxctx, &status);
if (dec == NULL) {
return NULL;
}

Loading…
Cancel
Save