[Python-checkins] r58426 - python/branches/release25-maint/Python/marshal.c

[neal.norwitz]

Author: neal.norwitz
Date: Fri Oct 12 05:59:09 2007
New Revision: 58426

Modified:
   python/branches/release25-maint/Python/marshal.c
Log:
Backport 58424:
Fix Coverity 185-186:  If the passed in FILE is NULL, uninitialized memory
would be accessed.



Modified: python/branches/release25-maint/Python/marshal.c
==============================================================================
--- python/branches/release25-maint/Python/marshal.c	(original)
+++ python/branches/release25-maint/Python/marshal.c	Fri Oct 12 05:59:09 2007
@@ -1013,6 +1013,7 @@
 	RFILE rf;
 	rf.fp = fp;
 	rf.strings = NULL;
+	rf.ptr = rf.end = NULL;
 	return r_long(&rf);
 }
 
@@ -1086,6 +1087,7 @@
 	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;