diff options
Diffstat (limited to 'Python/asdl.c')
| -rw-r--r-- | Python/asdl.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Python/asdl.c b/Python/asdl.c index c211078..c30d7d20 100644 --- a/Python/asdl.c +++ b/Python/asdl.c @@ -2,24 +2,24 @@ #include "asdl.h" asdl_seq * -_Py_asdl_seq_new(Py_ssize_t size, PyArena *arena) +asdl_seq_new(int size, PyArena *arena) { asdl_seq *seq = NULL; - size_t n; + size_t n = (size ? (sizeof(void *) * (size - 1)) : 0); /* check size is sane */ - if (size < 0 || - (size && (((size_t)size - 1) > (SIZE_MAX / sizeof(void *))))) { + if (size < 0 || size == INT_MIN || + (size && ((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 > SIZE_MAX - sizeof(asdl_seq)) { + if (n > PY_SIZE_MAX - sizeof(asdl_seq)) { PyErr_NoMemory(); return NULL; } + n += sizeof(asdl_seq); seq = (asdl_seq *)PyArena_Malloc(arena, n); @@ -33,24 +33,24 @@ _Py_asdl_seq_new(Py_ssize_t size, PyArena *arena) } asdl_int_seq * -_Py_asdl_int_seq_new(Py_ssize_t size, PyArena *arena) +asdl_int_seq_new(int size, PyArena *arena) { asdl_int_seq *seq = NULL; - size_t n; + size_t n = (size ? (sizeof(void *) * (size - 1)) : 0); /* check size is sane */ - if (size < 0 || - (size && (((size_t)size - 1) > (SIZE_MAX / sizeof(void *))))) { + if (size < 0 || size == INT_MIN || + (size && ((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 > SIZE_MAX - sizeof(asdl_seq)) { + if (n > PY_SIZE_MAX - sizeof(asdl_seq)) { PyErr_NoMemory(); return NULL; } + n += sizeof(asdl_seq); seq = (asdl_int_seq *)PyArena_Malloc(arena, n); |