Backport 58424:
Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory would be accessed.
This commit is contained in:
parent
7d9c00ec4f
commit
163048ed12
|
@ -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)
|
||||||
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;
|
||||||
|
|
Loading…
Reference in New Issue