From: Andrew M. Kuchling <amk@amk.ca>
Date: Tue, 3 Oct 2006 19:30:04 +0000 (+0000)
Subject: [Backport r51033 | neal.norwitz]
X-Git-Tag: v2.4.4c1~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99868849e7fe4cd8ca211ce835bd76d43feb5ead;p=thirdparty%2FPython%2Fcpython.git

[Backport r51033 | neal.norwitz]

Prevent memory leak on error.

Reported by Klocwork #36
---

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 0b36e7ef03d6..df564d44b3b5 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -3394,11 +3394,11 @@ load_string(Unpicklerobject *self)
 	/********************************************/
 
 	str = PyString_DecodeEscape(p, len, NULL, 0, NULL);
+	free(s);
 	if (str) {
 		PDATA_PUSH(self->stack, str, -1);
 		res = 0;
 	}
-	free(s);
 	return res;
 
   insecure: