diff options
| author | Stefan Krah <skrah@bytereef.org> | 2012-08-21 06:25:41 (GMT) |
|---|---|---|
| committer | Stefan Krah <skrah@bytereef.org> | 2012-08-21 06:25:41 (GMT) |
| commit | 5b27c53e36a909b451c1a87522fc41a7b16aa9e3 (patch) | |
| tree | 42122c71b19ef08c1b075dd67b2dd7fb1f8fcd25 /Objects | |
| parent | 139cd4352f38e3e1d6b1f86033dc86ec61620e72 (diff) | |
| parent | 7cacd2eb92dad7e63a0249974617de33f4c4a0e0 (diff) | |
| download | cpython-5b27c53e36a909b451c1a87522fc41a7b16aa9e3.zip cpython-5b27c53e36a909b451c1a87522fc41a7b16aa9e3.tar.gz cpython-5b27c53e36a909b451c1a87522fc41a7b16aa9e3.tar.bz2 | |
Merge 3.2.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/abstract.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index 5ac4ac9..ed5e196 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2710,6 +2710,13 @@ _PySequence_BytesToCharpArray(PyObject* self) if (argc == -1) return NULL; + assert(argc >= 0); + + if ((size_t)argc > (PY_SSIZE_T_MAX-sizeof(char *)) / sizeof(char *)) { + PyErr_NoMemory(); + return NULL; + } + array = malloc((argc + 1) * sizeof(char *)); if (array == NULL) { PyErr_NoMemory(); |