From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 10 May 2009 22:27:00 +0000 (+0000)
Subject: Issue #5990: fix memory leak introduced by PEP 383 commits
X-Git-Tag: v3.1rc1~182
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6bb9849735e859067227f66963a6c345a0a1c72;p=thirdparty%2FPython%2Fcpython.git

Issue #5990: fix memory leak introduced by PEP 383 commits
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 21dcb4d96384..ad4fff0c78a9 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -784,13 +784,16 @@ posix_2str(PyObject *args,
 	   char *format,
 	   int (*func)(const char *, const char *))
 {
-	PyObject *opath1, *opath2;
+	PyObject *opath1 = NULL, *opath2 = NULL;
 	char *path1, *path2;
 	int res;
 	if (!PyArg_ParseTuple(args, format,
 	                      PyUnicode_FSConverter, &opath1,
-	                      PyUnicode_FSConverter, &opath2))
+	                      PyUnicode_FSConverter, &opath2)) {
+		Py_XDECREF(opath1);
+		Py_XDECREF(opath2);
 		return NULL;
+	}
 	path1 = bytes2str(opath1, 1);
 	path2 = bytes2str(opath2, 1);
 	Py_BEGIN_ALLOW_THREADS