Uh oh!
There was an error while loading. Please reload this page.
Improve worst-case performance of inline.text regex - #1460
Merged
Conversation
Member
actual diff of gfm inline.text - /^(`+|[^`])[\s\S]*?(?=[\\<!\[`*~]|\b_| {2,}\n|https?:\/\/|ftp:\/\/|www\.|[a-zA-Z0-9.!#$%&'*+\/=?^_`{\|}~-]+@|$)/+ /^(`+|[^`])(?:[\s\S]*?(?:(?=[\\<!\[`*~]|\b_| {2,}\n|https?:\/\/|ftp:\/\/|www\.|$)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@))|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@))/ |
UziTech
requested changes
Apr 3, 2019
UziTech
left a comment
Member
There was a problem hiding this comment.
Could you add a redos test in /test/redos/ that will fail before this change and pass after?
anderskforce-pushed
the
inline-text-quadratic
branch
from
April 3, 2019 23:44
175fae6 to
18dbc0bCompareandersk
commented
Apr 3, 2019
ContributorAuthor
(Updated to address a separate quadratic slowdown in the same regex.) @UziTech Do you want me to literally drop in a gigantic |
UziTech
commented
Apr 3, 2019
Member
Tests that take longer than 1 second are marked as failed. maybe slim it down to a test taking 2 seconds before this fix. |
anderskforce-pushed
the
inline-text-quadratic
branch
from
April 4, 2019 00:00
18dbc0b to
bd789b3Compareandersk
commented
Apr 4, 2019
ContributorAuthor
@UziTech Done. |
UziTech
reviewed
Apr 4, 2019
Uh oh!
There was an error while loading. Please reload this page.
The old regex may take quadratic time to scan for potential line breaks or email addresses starting at every point. Fix it to avoid scanning from points that would have been in the middle of a previous scan. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
anderskforce-pushed
the
inline-text-quadratic
branch
from
April 4, 2019 18:14
830413b to
be27472CompareUziTech
commented
Apr 4, 2019
Member
@davisjam do you want to look at this and make sure no redos vectors are added? |
davisjam
reviewed
Apr 5, 2019
| br: /^( {2,}|\\)\n(?!\s*$)/, | ||
| del: noop, | ||
| text: /^(`+|[^`])[\s\S]*?(?=[\\<!\[`*]|\b_|{2,}\n|$)/ | ||
| text: /^(`+|[^`])(?:[\s\S]*?(?:(?=[\\<!\[`*]|\b_|$)|[^ ](?= {2,}\n))|(?= {2,}\n))/ |
davisjam
reviewed
Apr 5, 2019
| .replace(']|', '~]|') | ||
| .replace('|$', '|https?://|ftp://|www\\.|[a-zA-Z0-9.!#$%&\'*+/=?^_`{\\|}~-]+@|$') | ||
| .getRegex() | ||
| text: /^(`+|[^`])(?:[\s\S]*?(?:(?=[\\<!\[`*~]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@))|(?= {2,}\n|[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@))/ |
UziTech
commented
Apr 5, 2019
Member
This will be released in v0.6.2 🎉 #1441 |
This was referenced Apr 30, 2019
Logiclayer1111 pushed a commit
to Logiclayer1111/marked
that referenced
this pull request
Apr 20, 2026
Cannot use **(WhiteSpace)(WhiteSpace)(Return)** to break line while only one characher before it. And if use special character, it will reset the character count brought by [#1460](markedjs/marked#1460)
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The old regex may take quadratic time to scan for potential email addresses starting at every point. Fix it to avoid scanning from points that would have been in the middle of a previous scan.
Marked version:
0.1.3 and later (problem introduced by commit 00f1f7a)
Markdown flavor: GitHub Flavored Markdown
Description
Contributor
Committer
In most cases, this should be a different person than the contributor.