traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge fix for issue #12963.

This commit is contained in:
Stefan Krah 2011-09-12 16:24:48 +02:00
parent 1c82a14e86 b77c6c65c0
commit 2d78a87e2e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Objects/longobject.c
View File

@ -525,8 +525,8 @@ PyLong_AsUnsignedLong(PyObject *vv)
return x;
}
/* Get a C unsigned long int from a long int object.
Returns -1 and sets an error condition if overflow occurs. */
/* Get a C size_t from a long int object. Returns (size_t)-1 and sets
an error condition if overflow occurs. */
size_t
PyLong_AsSize_t(PyObject *vv)
@ -562,7 +562,7 @@ PyLong_AsSize_t(PyObject *vv)
if ((x >> PyLong_SHIFT) != prev) {
PyErr_SetString(PyExc_OverflowError,
"Python int too large to convert to C size_t");
return (unsigned long) -1;
return (size_t) -1;
}
}
return x;