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

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.
........
This commit is contained in:
Martin v. Löwis 2008-09-11 06:55:48 +00:00
parent 51bff5da8a
commit 5aca882cc6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Objects/obmalloc.c
View File

@ -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)