From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 21 Feb 2011 19:05:08 +0000 (+0000)
Subject: Fix issues on 32-bit systems introduced by r88460
X-Git-Tag: v3.3.0a1~3143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d32664271bfda1e94f5f3ef5e712d5a5966bf1b;p=python

Fix issues on 32-bit systems introduced by r88460
---

diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index e439c5b964..0189e77548 100644
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -951,10 +951,10 @@ PyZlib_adler32(PyObject *self, PyObject *args)
         Py_BEGIN_ALLOW_THREADS
         /* Avoid truncation of length for very large buffers. adler32() takes
            length as an unsigned int, which may be narrower than Py_ssize_t. */
-        while (len > (Py_ssize_t)UINT_MAX) {
+        while (len > (size_t) UINT_MAX) {
             adler32val = adler32(adler32val, buf, UINT_MAX);
-            buf += UINT_MAX;
-            len -= UINT_MAX;
+            buf += (size_t) UINT_MAX;
+            len -= (size_t) UINT_MAX;
         }
         adler32val = adler32(adler32val, buf, len);
         Py_END_ALLOW_THREADS
@@ -989,10 +989,10 @@ PyZlib_crc32(PyObject *self, PyObject *args)
         Py_BEGIN_ALLOW_THREADS
         /* Avoid truncation of length for very large buffers. crc32() takes
            length as an unsigned int, which may be narrower than Py_ssize_t. */
-        while (len > (Py_ssize_t)UINT_MAX) {
+        while (len > (size_t) UINT_MAX) {
             crc32val = crc32(crc32val, buf, UINT_MAX);
-            buf += UINT_MAX;
-            len -= UINT_MAX;
+            buf += (size_t) UINT_MAX;
+            len -= (size_t) UINT_MAX;
         }
         signed_val = crc32(crc32val, buf, len);
         Py_END_ALLOW_THREADS