Porting #9528 to release 2.0 branch #9972
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
Porting #9528 to release 2.0 branch
|
This needs to include commit 8cbbcd0 as well, or we'll ship the RegExp DoS we encountered with the next 2.0 release. |
|
@weswigham Thanks, cherry picked the commit. |
|
@weswigham am I good to merge this? |
|
Probably? But I'm not a formal gakekeeper of the |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Porting #9528 to release 2.0 branch
I squashed the commits from that branch to a single commit and cherry-picked the results to make this PR cleaner, but the original PR included several commits