mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 01:05:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

replace PY_SIZE_MAX with SIZE_MAX

Browse source
This commit is contained in:
Benjamin Peterson 2016-09-07 09:26:18 -07:00
parent c75abff533
commit 2f8bfef158
12 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Python/asdl.c
View file

@ -9,14 +9,14 @@ _Py_asdl_seq_new(Py_ssize_t size, PyArena *arena)
/* check size is sane */
if (size < 0 ||
(size && (((size_t)size - 1) > (PY_SIZE_MAX / sizeof(void *))))) {
(size && (((size_t)size - 1) > (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)) {
if (n > SIZE_MAX - sizeof(asdl_seq)) {
PyErr_NoMemory();
return NULL;
}
@ -40,14 +40,14 @@ _Py_asdl_int_seq_new(Py_ssize_t size, PyArena *arena)
/* check size is sane */
if (size < 0 ||
(size && (((size_t)size - 1) > (PY_SIZE_MAX / sizeof(void *))))) {
(size && (((size_t)size - 1) > (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)) {
if (n > SIZE_MAX - sizeof(asdl_seq)) {
PyErr_NoMemory();
return NULL;
}

2
Python/ast.c
View file

@ -3985,7 +3985,7 @@ decode_unicode_with_escapes(struct compiling *c, const char *s, size_t len)
const char *end;
/* check for integer overflow */
if (len > PY_SIZE_MAX / 6)
if (len > SIZE_MAX / 6)
return NULL;
/* "ä" (2 bytes) may become "\U000000E4" (10 bytes), or 1:5
"\ä" (3 bytes) may become "\u005c\U000000E4" (16 bytes), or ~1:6 */

4
Python/compile.c
View file

@ -804,7 +804,7 @@ compiler_next_instr(struct compiler *c, basicblock *b)
oldsize = b->b_ialloc * sizeof(struct instr);
newsize = oldsize << 1;
if (oldsize > (PY_SIZE_MAX >> 1)) {
if (oldsize > (SIZE_MAX >> 1)) {
PyErr_NoMemory();
return -1;
}
@ -4520,7 +4520,7 @@ assemble_init(struct assembler *a, int nblocks, int firstlineno)
a->a_lnotab = PyBytes_FromStringAndSize(NULL, DEFAULT_LNOTAB_SIZE);
if (!a->a_lnotab)
return 0;
if ((size_t)nblocks > PY_SIZE_MAX / sizeof(basicblock *)) {
if ((size_t)nblocks > SIZE_MAX / sizeof(basicblock *)) {
PyErr_NoMemory();
return 0;
}