Skip to content

Fixed multiple cases of vulnerable REs #2584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RunDevelopment merged 10 commits into from
Oct 25, 2020
Merged

Fixed multiple cases of vulnerable REs #2584

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fa2d5bb
Fixed multiple cases of vulnerable REs
RunDevelopment Oct 11, 2020
f42a82d
Fixed ReDos in Batch again
RunDevelopment Oct 12, 2020
7d092e0
Rest: Faster `table` pattern
RunDevelopment Oct 12, 2020
4d7188f
Fixed exp backtracking in C#
RunDevelopment Oct 13, 2020
866b175
Fixed more exp backtracking
RunDevelopment Oct 13, 2020
7eec3d1
Fixed more exp backtracking again.
RunDevelopment Oct 13, 2020
8abf511
Merge branch 'master' into issue2583
RunDevelopment Oct 13, 2020
0eccbc6
Fixed even more exp backtracking
RunDevelopment Oct 13, 2020
7716c9e
Merge branch 'master' into issue2583
RunDevelopment Oct 25, 2020
ab127f6
Fixed last cases of exponential backtracking
RunDevelopment Oct 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/prism-asciidoc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(function (Prism) {

var attributes = {
pattern: /(^[ \t]*)\[(?!\[)(?:(["'$`])(?:(?!\2)[^\\]|\\.)*\2|\[(?:[^\]\\]|\\.)*\]|[^\]\\]|\\.)*\]/m,
pattern: /(^[ \t]*)\[(?!\[)(?:(["'$`])(?:(?!\2)[^\\]|\\.)*\2|\[(?:[^\[\]\\]|\\.)*\]|[^\[\]\\"'$`]|\\.)*\]/m,
lookbehind: true,
inside: {
'quoted': {
Expand Down Expand Up @@ -32,7 +32,7 @@
alias: 'comment'
},
'table': {
pattern: /^\|={3,}(?:(?:\r?\n|\r).*)*?(?:\r?\n|\r)\|={3,}$/m,
pattern: /^\|={3,}(?:(?:\r?\n|\r(?!\n)).*)*?(?:\r?\n|\r)\|={3,}$/m,
inside: {
'specifiers': {
pattern: /(?!\|)(?:(?:(?:\d+(?:\.\d+)?|\.\d+)[+*])?(?:[<^>](?:\.[<^>])?|\.[<^>])?[a-z]*)(?=\|)/,
Expand Down
2 changes: 1 addition & 1 deletion components/prism-asciidoc.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/prism-bash.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
},
// “Normal” string
{
pattern: /(^|[^\\](?:\\\\)*)(["'])(?:\\[\s\S]|\$\([^)]+\)|`[^`]+`|(?!\2)[^\\])*\2/,
pattern: /(^|[^\\](?:\\\\)*)(["'])(?:\\[\s\S]|\$\([^)]+\)|\$(?!\()|`[^`]+`|(?!\2)[^\\`$])*\2/,
lookbehind: true,
greedy: true,
inside: insideString
Expand Down
Loading