From: Andrew Dalke <dalke@dalkescientific.com>
Date: Thu, 25 May 2006 18:18:39 +0000 (+0000)
Subject: Added overflow test for adding two (very) large strings where the
X-Git-Tag: v2.5b1~528
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=598710c7270dc92839be0e1b5608cf7b5b33e7ec;p=python

Added overflow test for adding two (very) large strings where the
new string is over max Py_ssize_t.  I have no way to test it on my
box or any box I have access to.  At least it doesn't break anything.
---

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 277d4b3287..e74744d369 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1023,7 +1023,7 @@ string_length(PyStringObject *a)
 static PyObject *
 string_concat(register PyStringObject *a, register PyObject *bb)
 {
-	register size_t size;
+	register Py_ssize_t size;
 	register PyStringObject *op;
 	if (!PyString_Check(bb)) {
 #ifdef Py_USING_UNICODE
@@ -1047,7 +1047,12 @@ string_concat(register PyStringObject *a, register PyObject *bb)
 		return (PyObject *)a;
 	}
 	size = a->ob_size + b->ob_size;
-	/* XXX check overflow */
+	if (size < 0) {
+		PyErr_SetString(PyExc_OverflowError,
+				"strings are too large to concat");
+		return NULL;
+	}
+	  
 	/* Inline PyObject_NewVar */
 	op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
 	if (op == NULL)