Avoid parsing encrypted object streams early and correctly parse object streams upon decryption #385
Conversation
This file contains 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
StephanvanSchaik
changed the title
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.
OK, after testing upstream to make sure lopdf works for issue #369, I realized some things were still missing.
The first commit makes sure that
Reader::read()does not try to parse object streams when the document is encrypted, thus leaving them intact forDocument::decrypt()such that it can parse the object streams after decrypting the streams.The second commit fixes #382. I was somehow missing a
continueafter checking that the stream is not an object stream as well as the part to actually add the newly parsed objects.I tested this branch to make sure this all works for the document provided in issue #369 and everything looks good now.