From af8fc645af1db75a26e9f2e5ad48812a1dc2ee12 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 2 May 2014 23:26:03 +0200 Subject: [PATCH] Issue #21233: Oops, Fix _PyObject_Alloc(): initialize nbytes before going to redirect. --- Objects/obmalloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c index 9fd7b31c863..e16a1db808d 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(); /*