Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Stefan Krah 2017-09-10 18:08:04 +02:00 committed by GitHub
parent 30644dee0c
commit 3cedf46cdb
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/_decimal/_decimal.c
View File

@ -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;
}