diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-18 00:47:36 +0000 |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-18 00:47:36 +0000 |
| commit | 9c74b14fe9b6dddc9d41dd37f431f174350004d4 (patch) | |
| tree | 3d30d794259f55f5021f5e8036447523d0e1eea3 /Parser/node.c | |
| parent | 036aa5433e963f6576c5dfa02ace4ca0e2c642a2 (diff) | |
| download | cpython-git-9c74b14fe9b6dddc9d41dd37f431f174350004d4.tar.gz | |
Merged revisions 64114 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64114 | gregory.p.smith | 2008-06-11 09:41:16 +0200 (mer., 11 juin 2008) | 6 lines
Merge in release25-maint r60793:
Added checks for integer overflows, contributed by Google. Some are
only available if asserts are left in the code, in cases where they
can't be triggered from Python code.
........
Diffstat (limited to 'Parser/node.c')
| -rw-r--r-- | Parser/node.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Parser/node.c b/Parser/node.c index d133a0d178..f4c86cb0ff 100644 --- a/Parser/node.c +++ b/Parser/node.c @@ -91,6 +91,9 @@ PyNode_AddChild(register node *n1, int type, char *str, int lineno, int col_offs if (current_capacity < 0 || required_capacity < 0) return E_OVERFLOW; if (current_capacity < required_capacity) { + if (required_capacity > PY_SIZE_MAX / sizeof(node)) { + return E_NOMEM; + } n = n1->n_child; n = (node *) PyObject_REALLOC(n, required_capacity * sizeof(node)); |