From: Barry Warsaw <barry@python.org>
Date: Mon, 1 Feb 1999 17:09:00 +0000 (+0000)
Subject: PyPcre_expand(): Fixed two memory leaks, where a PyString_FromString()
X-Git-Tag: v1.5.2b2~169
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6aa42579be55f82141b183d547f71ce10303677a;p=thirdparty%2FPython%2Fcpython.git

PyPcre_expand(): Fixed two memory leaks, where a PyString_FromString()
was appended to a list.  Lists are reference count neutral, so the
string must be DECREF'd.  Also added some checks for the return value
of PyList_Append().

Note: there are still some memory problems reported by Purify (I get
two Array Bounds Reads still and an Unitialized Memory Read).  Also,
in scanning the code, there appears to be some potential problems
where return values aren't checked.  To much to attack now though.
---

diff --git a/Modules/pcremodule.c b/Modules/pcremodule.c
index fa9869648878..3b61697e0013 100644
--- a/Modules/pcremodule.c
+++ b/Modules/pcremodule.c
@@ -489,8 +489,19 @@ PyPcre_expand(self, args)
 
 			if (start!=i)
 			{
-				PyList_Append(results, 
-					      PyString_FromStringAndSize((char *)repl+start, i-start));
+				int status;
+				PyObject *s = PyString_FromStringAndSize(
+					(char *)repl+start, i-start);
+				if (s == NULL) {
+					Py_DECREF(results);
+					return NULL;
+				}
+				status = PyList_Append(results, s);
+				Py_DECREF(s);
+				if (status < 0) {
+					Py_DECREF(results);
+					return NULL;
+				}
 				total_len += i-start;
 			}
 			i++;
@@ -574,7 +585,19 @@ PyPcre_expand(self, args)
 
 	if (start!=i)
 	{
-		PyList_Append(results, PyString_FromStringAndSize((char *)repl+start, i-start));
+		int status;
+		PyObject *s = PyString_FromStringAndSize((char *)repl+start, 
+							 i-start);
+		if (s == NULL) {
+			Py_DECREF(results);
+			return NULL;
+		}
+		status = PyList_Append(results, s);
+		Py_DECREF(s);
+		if (status < 0) {
+			Py_DECREF(results);
+			return NULL;
+		}
 		total_len += i-start;
 	}