diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-09-11 06:55:48 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-09-11 06:55:48 (GMT) |
| commit | 5aca882cc6bbf8887869c73ea5d0b008d313ca90 (patch) | |
| tree | be0ec8bdf8497eb299bb73013cae8b83c6df5a0a /Objects/obmalloc.c | |
| parent | 51bff5da8aaefd2f86b25b3d78aa7a53797eb2a7 (diff) | |
| download | cpython-5aca882cc6bbf8887869c73ea5d0b008d313ca90.zip cpython-5aca882cc6bbf8887869c73ea5d0b008d313ca90.tar.gz cpython-5aca882cc6bbf8887869c73ea5d0b008d313ca90.tar.bz2 | |
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.
........
Diffstat (limited to 'Objects/obmalloc.c')
| -rw-r--r-- | Objects/obmalloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c index b4ad60a..fc5ccf7 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) |