From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 11 Sep 2008 06:55:48 +0000 (+0000)
Subject: Merged revisions 66383 via svnmerge from
X-Git-Tag: v3.0rc1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5aca882cc6bbf8887869c73ea5d0b008d313ca90;p=python

Merged revisions 66383 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66383 | martin.v.loewis | 2008-09-11 08:53:30 +0200 (Do, 11 Sep 2008) | 3 lines

  Issue #3642: Suppress warning in obmalloc when size_t is
  larger than uint. Reverts r65975. Reviewed by Brett Cannon.
........
---

diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index b4ad60a865..fc5ccf7abe 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -517,7 +517,7 @@ new_arena(void)
 #endif
 	if (unused_arena_objects == NULL) {
 		uint i;
-		size_t numarenas;
+		uint numarenas;
 		size_t nbytes;
 
 		/* Double the number of arena objects on each allocation.
@@ -526,8 +526,10 @@ new_arena(void)
 		numarenas = maxarenas ? maxarenas << 1 : INITIAL_ARENA_OBJECTS;
 		if (numarenas <= maxarenas)
 			return NULL;	/* overflow */
+#if SIZEOF_SIZE_T <= SIZEOF_INT
 		if (numarenas > PY_SIZE_MAX / sizeof(*arenas))
 			return NULL;	/* overflow */
+#endif
 		nbytes = numarenas * sizeof(*arenas);
 		arenaobj = (struct arena_object *)realloc(arenas, nbytes);
 		if (arenaobj == NULL)