Nailed a couple of memory leaks, caught by Purify.

warsaw · warsaw · commit 4bc9d3956059 · 1997-01-09T22:22:05.000Z
diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c
@@ -51,6 +51,7 @@ static PyObject *mkgrent(p)
 			Py_DECREF(w);
 			return NULL;
 		}
+		Py_DECREF(x);
 	}
 	v = Py_BuildValue("(sslO)",
 		       p->gr_name,
@@ -112,6 +113,7 @@ static PyObject *grp_getgrall(self, args)
 			Py_DECREF(d);
 			return NULL;
 		}
+		Py_DECREF(v);
 	}
 	return d;
 }
diff --git a/Modules/nismodule.c b/Modules/nismodule.c
@@ -292,7 +292,7 @@ nis_maplist ()
 	nisresp_maplist *list;
 	char *dom;
 	CLIENT *cl, *clnt_create();
-	char *server = "";
+	char *server = NULL;
 	int mapi = 0;
         int err;
 
@@ -301,25 +301,32 @@ nis_maplist ()
 		return NULL;
 	}
 
-	while (!strcmp("", server) && aliases[mapi].map != 0L) {
+	while (!server && aliases[mapi].map != 0L) {
 		yp_master (dom, aliases[mapi].map, &server);
 		mapi++;
 	}
-        if (!strcmp("", server)) {
+        if (!server) {
             PyErr_SetString(NisError, "No NIS master found for any map");
             return NULL;
         }
 	cl = clnt_create(server, YPPROG, YPVERS, "tcp");
 	if (cl == NULL) {
 		PyErr_SetString(NisError, clnt_spcreateerror(server));
-		return NULL;
+		goto finally;
 	}
 	list = nisproc_maplist_2 (&dom, cl);
+	clnt_destroy(cl);
 	if (list == NULL)
-		return NULL;
+		goto finally;
 	if (list->stat != NIS_TRUE)
-		return NULL;
+		goto finally;
+
+	PyMem_DEL(server);
 	return list->maps;
+
+  finally:
+	PyMem_DEL(server);
+	return NULL;
 }
 
 static PyObject *
@@ -337,12 +344,14 @@ nis_maps (self, args)
 	if ((list = PyList_New(0)) == NULL)
 		return NULL;
 	for (maps = maps->next; maps; maps = maps->next) {
-		if (PyList_Append (list, PyString_FromString (maps->map)) < 0)
+		PyObject *str = PyString_FromString(maps->map);
+		if (!str || PyList_Append(list, str) < 0)
 		{
 			Py_DECREF(list);
 			list = NULL;
 			break;
 		}
+		Py_DECREF(str);
 	}
 	/* XXX Shouldn't we free the list of maps now? */
 	return list;
diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
@@ -109,6 +109,7 @@ pwd_getpwall(self, args)
 			Py_DECREF(d);
 			return NULL;
 		}
+		Py_DECREF(v);
 	}
 	return d;
 }
diff --git a/Modules/regexmodule.c b/Modules/regexmodule.c
@@ -518,6 +518,8 @@ symcomp(pattern, gdict)
 					    Py_XDECREF(npattern);
 					    return NULL;
 				    }
+				    Py_DECREF(group_name);
+				    Py_DECREF(group_index);
 				    ++o;     /* eat the '>' */
 				    break;
 				}
@@ -573,6 +575,7 @@ regex_symcomp(self, args)
 	PyObject *tran = NULL;
 	PyObject *gdict = NULL;
 	PyObject *npattern;
+	PyObject *retval = NULL;
 
 	if (!PyArg_ParseTuple(args, "S|S", &pattern, &tran))
 		return NULL;
@@ -583,7 +586,9 @@ regex_symcomp(self, args)
 		Py_DECREF(pattern);
 		return NULL;
 	}
-	return newregexobject(npattern, tran, pattern, gdict);
+	retval = newregexobject(npattern, tran, pattern, gdict);
+	Py_DECREF(npattern);
+	return retval;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ static PyObject *mkgrent(p)`
`51`	`51`	`Py_DECREF(w);`
`52`	`52`	`return NULL;`
`53`	`53`	`}`
	`54`	`+ Py_DECREF(x);`
`54`	`55`	`}`
`55`	`56`	`v = Py_BuildValue("(sslO)",`
`56`	`57`	`p->gr_name,`
`@@ -112,6 +113,7 @@ static PyObject *grp_getgrall(self, args)`
`112`	`113`	`Py_DECREF(d);`
`113`	`114`	`return NULL;`
`114`	`115`	`}`
	`116`	`+ Py_DECREF(v);`
`115`	`117`	`}`
`116`	`118`	`return d;`
`117`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ pwd_getpwall(self, args)`
`109`	`109`	`Py_DECREF(d);`
`110`	`110`	`return NULL;`
`111`	`111`	`}`
	`112`	`+ Py_DECREF(v);`
`112`	`113`	`}`
`113`	`114`	`return d;`
`114`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -518,6 +518,8 @@ symcomp(pattern, gdict)`
`518`	`518`	`Py_XDECREF(npattern);`
`519`	`519`	`return NULL;`
`520`	`520`	`}`
	`521`	`+ Py_DECREF(group_name);`
	`522`	`+ Py_DECREF(group_index);`
`521`	`523`	`++o; /* eat the '>' */`
`522`	`524`	`break;`
`523`	`525`	`}`
`@@ -573,6 +575,7 @@ regex_symcomp(self, args)`
`573`	`575`	`PyObject *tran = NULL;`
`574`	`576`	`PyObject *gdict = NULL;`
`575`	`577`	`PyObject *npattern;`
	`578`	`+ PyObject *retval = NULL;`
`576`	`579`
`577`	`580`	`if (!PyArg_ParseTuple(args, "S\|S", &pattern, &tran))`
`578`	`581`	`return NULL;`
`@@ -583,7 +586,9 @@ regex_symcomp(self, args)`
`583`	`586`	`Py_DECREF(pattern);`
`584`	`587`	`return NULL;`
`585`	`588`	`}`
`586`		`- return newregexobject(npattern, tran, pattern, gdict);`
	`589`	`+ retval = newregexobject(npattern, tran, pattern, gdict);`
	`590`	`+ Py_DECREF(npattern);`
	`591`	`+ return retval;`
`587`	`592`	`}`
`588`	`593`
`589`	`594`