Commit 3cedf46c authored by Stefan Krah's avatar Stefan Krah Committed by GitHub

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

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