From: Neal Norwitz <nnorwitz@gmail.com>
Date: Fri, 12 Oct 2007 03:59:09 +0000 (+0000)
Subject: Backport 58424:
X-Git-Tag: v2.5.2c1~165
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=163048ed12c9fdc5738cc7b3f903ecd0749b1d61;p=thirdparty%2FPython%2Fcpython.git

Backport 58424:
Fix Coverity 185-186:  If the passed in FILE is NULL, uninitialized memory
would be accessed.
---

diff --git a/Python/marshal.c b/Python/marshal.c
index eac4616cc569..897c15ec8ad2 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1013,6 +1013,7 @@ PyMarshal_ReadLongFromFile(FILE *fp)
 	RFILE rf;
 	rf.fp = fp;
 	rf.strings = NULL;
+	rf.ptr = rf.end = NULL;
 	return r_long(&rf);
 }
 
@@ -1086,6 +1087,7 @@ PyMarshal_ReadObjectFromFile(FILE *fp)
 	rf.fp = fp;
 	rf.strings = PyList_New(0);
 	rf.depth = 0;
+	rf.ptr = rf.end = NULL;
 	result = r_object(&rf);
 	Py_DECREF(rf.strings);
 	return result;