Commit 15f26617 authored by Neal Norwitz's avatar Neal Norwitz

Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory

would be accessed.

Will backport.
parent a7d329a9
...@@ -1013,6 +1013,7 @@ PyMarshal_ReadLongFromFile(FILE *fp) ...@@ -1013,6 +1013,7 @@ PyMarshal_ReadLongFromFile(FILE *fp)
RFILE rf; RFILE rf;
rf.fp = fp; rf.fp = fp;
rf.strings = NULL; rf.strings = NULL;
rf.ptr = rf.end = NULL;
return r_long(&rf); return r_long(&rf);
} }
...@@ -1086,6 +1087,7 @@ PyMarshal_ReadObjectFromFile(FILE *fp) ...@@ -1086,6 +1087,7 @@ PyMarshal_ReadObjectFromFile(FILE *fp)
rf.fp = fp; rf.fp = fp;
rf.strings = PyList_New(0); rf.strings = PyList_New(0);
rf.depth = 0; rf.depth = 0;
rf.ptr = rf.end = NULL;
result = r_object(&rf); result = r_object(&rf);
Py_DECREF(rf.strings); Py_DECREF(rf.strings);
return result; return result;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment