EscherBSERecord fillFields() to return consumed bytes#1105
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.Suggestion cannot be applied right now. Please check back later.
Summary
Restore the
fillFields()contract inEscherBSERecordby returning the number of bytes actually consumed from the input stream rather than a reconstructed serialized size.Problem
EscherBSERecord.fillFields()returned the embedded blip'sgetRecordSize(), which can differ from the number of bytes actually read when malformed records contain inconsistent size information.This can cause parent containers to advance by an incorrect offset and mis-locate subsequent sibling records during parsing.
Fix
bytesRead) when calculating the value returned byfillFields().fillFields()reports consumed input bytes.Test
EscherMetafileBlipwhosecbSavevalue exceeds the data declared by the record length.EscherBSERecord.fillFields()reports the record's actual on-disk length rather than an inflated reconstructed size.