FifoDataFile: Improve error handling when reading #10004
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
The main thing I'm targeting here is opening a 0-byte file, as currently that produces the nonsensical error message "The DFF's minimum loader version (1) exceeds the version of this FIFO Player (5)" (due to the check on
header.fileId != FILE_ID). I often end up opening a 0-byte file if I try to open it while it's still downloading (as firefox creates a 0-byte file as well as a .tmp file).The other checks were added for completeness; note that
Common::IOFileuses RAII so the manual close calls aren't needed. I removed them forLoadbut haven't touched anything inSave.