From: Tim Peters <tim.peters@gmail.com>
Date: Thu, 6 Dec 2001 20:29:32 +0000 (+0000)
Subject: PyString_FromString:  this requires its argument be non-NULL, but doesn't
X-Git-Tag: v2.2.1c1~508
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62de65b25e56d01a7cd10f55576ff00eae1021fc;p=thirdparty%2FPython%2Fcpython.git

PyString_FromString:  this requires its argument be non-NULL, but doesn't
check it.  Added an assert() to that effect.
---

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index cb0e20b52ba2..657b20093b92 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -105,8 +105,11 @@ PyString_FromStringAndSize(const char *str, int size)
 PyObject *
 PyString_FromString(const char *str)
 {
-	register size_t size = strlen(str);
+	register size_t size;
 	register PyStringObject *op;
+
+	assert(str != NULL);
+	size = strlen(str);
 	if (size > INT_MAX) {
 		PyErr_SetString(PyExc_OverflowError,
 			"string is too long for a Python string");