From: Thomas Wouters <thomas@python.org>
Date: Wed, 1 Mar 2006 22:30:47 +0000 (+0000)
Subject: Fix gcc (4.0.x) warning about use of uninitialized variables.
X-Git-Tag: v2.5a0~421
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f401ef73dbdfd3b144ae25be62e2c139d699916;p=thirdparty%2FPython%2Fcpython.git

Fix gcc (4.0.x) warning about use of uninitialized variables.
(PyMarshal_ReadShortFromFile() is only used in zipimport.c, I don't believe
the extra initializations will matter one way or another.)
---

diff --git a/Python/marshal.c b/Python/marshal.c
index 4e922dc83884..b61436b72e2a 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -885,8 +885,9 @@ int
 PyMarshal_ReadShortFromFile(FILE *fp)
 {
 	RFILE rf;
+	assert(fp);
 	rf.fp = fp;
-	rf.strings = NULL;
+	rf.strings = rf.end = rf.ptr = NULL;
 	return r_short(&rf);
 }