[cffLib] Fix for #1451 #1456
Merged
[cffLib] Fix for #1451 #1456
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
…tecodes 11 and 14 can be part of an encoded numeric value; so remove 'return' or 'endchar' at the program level instead of bytescode
|
The "if not isCFF2" test later could actually be the else clause of this new if. That error could be raised even before compilation starts. |
Yes, let me incorporate that change in this PR. |
anthrotype
reviewed
Jan 17, 2019
| if isCFF2: | ||
| # If present, remove return and endchar operators. | ||
| if program and program[-1] in ("return", "endchar"): | ||
| program = program[:-1] |
There was a problem hiding this comment.
del program[-1] would avoid the copy
There was a problem hiding this comment.
Yeah, but I thought it was nicer to not alter self.program. But I can change it if you want.
There was a problem hiding this comment.
ah, you mean, in case the reference to program list was shared by some other object.. Ok, let's leave it like that.
anthrotype
approved these changes
Jan 17, 2019
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.
A charstring is not guaranteed to end in an operator, so the final bytecodes 11 and 14 can be part of an encoded numeric value; so remove 'return' or 'endchar' at the program level instead of bytecode.
Fixes next issue from #1451