summaryrefslogtreecommitdiff
path: root/Objects
diff options
context:
space:
mode:
authorZackery Spytz <zspytz@gmail.com>2019-06-07 09:41:10 -0600
committerVictor Stinner <vstinner@redhat.com>2019-06-07 17:41:10 +0200
commite36ed475ea429f7cc80a4d65f80b44686a74b246 (patch)
tree10fde905cce142de868716059b0a1377618a5324 /Objects
parent4ea9dbda4ad823875ed79a25062a7f5415d91b22 (diff)
downloadcpython-git-e36ed475ea429f7cc80a4d65f80b44686a74b246.tar.gz
[3.7] bpo-37170: Fix the cast on error in PyLong_AsUnsignedLongLongMask() (GH-13860) (GH-13896)
(cherry picked from commit dc2476500d91082f0c907772c83a044bf49af279) Co-authored-by: Zackery Spytz <zspytz@gmail.com>
Diffstat (limited to 'Objects')
-rw-r--r--Objects/longobject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 59c7efbfee..7628a114e3 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -1309,7 +1309,7 @@ _PyLong_AsUnsignedLongLongMask(PyObject *vv)
if (vv == NULL || !PyLong_Check(vv)) {
PyErr_BadInternalCall();
- return (unsigned long) -1;
+ return (unsigned long long) -1;
}
v = (PyLongObject *)vv;
switch(Py_SIZE(v)) {
@@ -1337,7 +1337,7 @@ PyLong_AsUnsignedLongLongMask(PyObject *op)
if (op == NULL) {
PyErr_BadInternalCall();
- return (unsigned long)-1;
+ return (unsigned long long)-1;
}
if (PyLong_Check(op)) {