[0.26] try backporting fixes for CVE-2018-{12264,12265} #398
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
|
OK, added. Only trivial conflicts in there. I wasn't able to run |
vcunat
force-pushed
the
0.26-cve-roundup-46
branch
from
10f6128 to
65f1fcb
Compare
The testsuite now uses python's template module for string substitutions which allows for a more natural substitution syntax known from the shell. Also, it allows to run the substitutions multiple times, which is not possible with string.format(). The heavy-lifting is now performed via a metaclass, which expands all variables on the class creation. (cherry picked from commit bd9d085)
|
OK, by misusing travis I fixed the tests somehow, though I imagine you may very likely prefer a different way :-) |
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.
I tried backporting the missing CVE commits from #365 and #366, but someone actually knowing this project's code should have a look. Perhaps @D4N?
Add offset_ and size_...had only a trivial conflict around the includes, so I haven't really read it properly.Fix addition overflows...wasn't so trivial, as the code in the second hunk has changed a bit.