merge with 3.4

1 files changed, 8 insertions, 8 deletions

diff --git a/Python/asdl.c b/Python/asdl.c
index 74fa9410e4..df387b2119 100644
--- a/Python/asdl.c
+++ b/Python/asdl.c
@@ -5,21 +5,21 @@ asdl_seq *
 _Py_asdl_seq_new(Py_ssize_t size, PyArena *arena)
 {
     asdl_seq *seq = NULL;
-    size_t n = (size ? (sizeof(void *) * (size - 1)) : 0);
+    size_t n;
 
     /* check size is sane */
-    if (size < 0 || size == INT_MIN ||
-        (size && ((size - 1) > (PY_SIZE_MAX / sizeof(void *))))) {
+    if (size < 0 ||
+        (size && (((size_t)size - 1) > (PY_SIZE_MAX / sizeof(void *))))) {
         PyErr_NoMemory();
         return NULL;
     }
+    n = (size ? (sizeof(void *) * (size - 1)) : 0);
 
     /* check if size can be added safely */
     if (n > PY_SIZE_MAX - sizeof(asdl_seq)) {
         PyErr_NoMemory();
         return NULL;
     }
-
     n += sizeof(asdl_seq);
 
     seq = (asdl_seq *)PyArena_Malloc(arena, n);
@@ -36,21 +36,21 @@ asdl_int_seq *
 _Py_asdl_int_seq_new(Py_ssize_t size, PyArena *arena)
 {
     asdl_int_seq *seq = NULL;
-    size_t n = (size ? (sizeof(void *) * (size - 1)) : 0);
+    size_t n;
 
     /* check size is sane */
-    if (size < 0 || size == INT_MIN ||
-        (size && ((size - 1) > (PY_SIZE_MAX / sizeof(void *))))) {
+    if (size < 0 ||
+        (size && (((size_t)size - 1) > (PY_SIZE_MAX / sizeof(void *))))) {
             PyErr_NoMemory();
             return NULL;
     }
+    n = (size ? (sizeof(void *) * (size - 1)) : 0);
 
     /* check if size can be added safely */
     if (n > PY_SIZE_MAX - sizeof(asdl_seq)) {
         PyErr_NoMemory();
         return NULL;
     }
-
     n += sizeof(asdl_seq);
 
     seq = (asdl_int_seq *)PyArena_Malloc(arena, n);