From 3cedf46cdbeefc019f4a672c1104f3d5e94712bd Mon Sep 17 00:00:00 2001 From: Stefan Krah Date: Sun, 10 Sep 2017 18:08:04 +0200 Subject: [PATCH] bpo-31406: Fix crash due to lack of type checking in subclassing. (#3477) --- Modules/_decimal/_decimal.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c index e3c1a7997fa..18fa2e4fa5e 100644 --- a/Modules/_decimal/_decimal.c +++ b/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; }