[Python-checkins] r60294 - python/branches/release25-maint/Objects/listobject.c

[guido.van.rossum]

Author: guido.van.rossum
Date: Fri Jan 25 20:42:36 2008
New Revision: 60294

Modified:
   python/branches/release25-maint/Objects/listobject.c
Log:
Rewrite the list_inline_repeat overflow check slightly differently.


Modified: python/branches/release25-maint/Objects/listobject.c
==============================================================================
--- python/branches/release25-maint/Objects/listobject.c	(original)
+++ python/branches/release25-maint/Objects/listobject.c	Fri Jan 25 20:42:36 2008
@@ -490,7 +490,7 @@
 	if (n && size/n != a->ob_size)
 		return PyErr_NoMemory();
 	if (size == 0)
-              return PyList_New(0);
+		return PyList_New(0);
 	np = (PyListObject *) PyList_New(size);
 	if (np == NULL)
 		return NULL;
@@ -672,10 +672,11 @@
 		return (PyObject *)self;
 	}
 
-        p = size*n;
-        if (p/n != size)
+	if (size > SSIZE_MAX / n) {
 		return PyErr_NoMemory();
-	if (list_resize(self, p) == -1)
+	}
+
+	if (list_resize(self, size*n) == -1)
 		return NULL;
 
 	p = size;