]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #12963: PyLong_AsSize_t() now returns (size_t)-1 in all error cases.
authorStefan Krah <skrah@bytereef.org>
Mon, 12 Sep 2011 14:22:47 +0000 (16:22 +0200)
committerStefan Krah <skrah@bytereef.org>
Mon, 12 Sep 2011 14:22:47 +0000 (16:22 +0200)
Objects/longobject.c

index 552f8f0b898c1e0792a8ae0ea0bb7566e6b91f58..a0b16a66f2d9da50c8f3554849b0a1e0be5cf9e5 100644 (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;