From: Guido van Rossum <guido@python.org>
Date: Fri, 11 Oct 2002 21:05:56 +0000 (+0000)
Subject: Add checks for size overflow on list*n, list+list, tuple+tuple.
X-Git-Tag: v2.3c1~3806
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5c0e6d6c8e3513017009796ff34bb9c14512559;p=python

Add checks for size overflow on list*n, list+list, tuple+tuple.

Will backport.
---

diff --git a/Objects/listobject.c b/Objects/listobject.c
index 64de38bcb3..2cb08d3166 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -391,6 +391,8 @@ list_concat(PyListObject *a, PyObject *bb)
 	}
 #define b ((PyListObject *)bb)
 	size = a->ob_size + b->ob_size;
+	if (size < 0)
+		return PyErr_NoMemory();
 	np = (PyListObject *) PyList_New(size);
 	if (np == NULL) {
 		return NULL;
@@ -419,6 +421,8 @@ list_repeat(PyListObject *a, int n)
 	if (n < 0)
 		n = 0;
 	size = a->ob_size * n;
+	if (size/a->ob_size != n)
+		return PyErr_NoMemory();
 	np = (PyListObject *) PyList_New(size);
 	if (np == NULL)
 		return NULL;
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 6c2162aa69..3a8f072a26 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -330,6 +330,8 @@ tupleconcat(register PyTupleObject *a, register PyObject *bb)
 	}
 #define b ((PyTupleObject *)bb)
 	size = a->ob_size + b->ob_size;
+	if (size < 0)
+		return PyErr_NoMemory();
 	np = (PyTupleObject *) PyTuple_New(size);
 	if (np == NULL) {
 		return NULL;