diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-05-02 21:26:03 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-05-02 21:26:03 (GMT) |
| commit | af8fc645af1db75a26e9f2e5ad48812a1dc2ee12 (patch) | |
| tree | 22097cfc515975cd0132d876774e007c57489102 /Objects/obmalloc.c | |
| parent | db067af12a5ebb889874e47d8177f9c4a3dc9a68 (diff) | |
| download | cpython-af8fc645af1db75a26e9f2e5ad48812a1dc2ee12.zip cpython-af8fc645af1db75a26e9f2e5ad48812a1dc2ee12.tar.gz cpython-af8fc645af1db75a26e9f2e5ad48812a1dc2ee12.tar.bz2 | |
Issue #21233: Oops, Fix _PyObject_Alloc(): initialize nbytes before going to
redirect.
Diffstat (limited to 'Objects/obmalloc.c')
| -rw-r--r-- | Objects/obmalloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c index 9fd7b31..e16a1db 100644 --- a/Objects/obmalloc.c +++ b/Objects/obmalloc.c @@ -1183,12 +1183,12 @@ _PyObject_Alloc(int use_calloc, void *ctx, size_t nelem, size_t elsize) goto redirect; #endif - if (nelem == 0 || elsize == 0) - goto redirect; - assert(nelem <= PY_SSIZE_T_MAX / elsize); nbytes = nelem * elsize; + if (nelem == 0 || elsize == 0) + goto redirect; + if ((nbytes - 1) < SMALL_REQUEST_THRESHOLD) { LOCK(); /* |