diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2004-09-20 06:17:46 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2004-09-20 06:17:46 +0000 |
| commit | 42fc137e9ffb424692f291fc3c0d3937e50dff68 (patch) | |
| tree | e9cb62fdb026ad3a6237c48ca6f4eafaa134153e /Objects/longobject.c | |
| parent | a1c075515cc86c4ad532a756cb896b215e772b06 (diff) | |
| download | cpython-42fc137e9ffb424692f291fc3c0d3937e50dff68.tar.gz | |
Patch #1024670: Support int objects in PyLong_AsUnsignedLong[Mask].
Diffstat (limited to 'Objects/longobject.c')
| -rw-r--r-- | Objects/longobject.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Objects/longobject.c b/Objects/longobject.c index 0103e5c079..0ee9a694a9 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -245,6 +245,15 @@ PyLong_AsUnsignedLong(PyObject *vv) int i; if (vv == NULL || !PyLong_Check(vv)) { + if (vv != NULL && PyInt_Check(vv)) { + long val = PyInt_AsLong(vv); + if (val < 0) { + PyErr_SetString(PyExc_OverflowError, + "can't convert negative value to unsigned long"); + return (unsigned long) -1; + } + return val; + } PyErr_BadInternalCall(); return (unsigned long) -1; } @@ -279,6 +288,8 @@ PyLong_AsUnsignedLongMask(PyObject *vv) int i, sign; if (vv == NULL || !PyLong_Check(vv)) { + if (vv != NULL && PyInt_Check(vv)) + return PyInt_AsUnsignedLongMask(vv); PyErr_BadInternalCall(); return (unsigned long) -1; } |