Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Unreleased

* Fix possible regular expression catastrophic backtracking [\#105](https://github.com/anandthakker/doiuse/pull/105)

## 4.3.1 (2020-10-30)

* Optimize package size by ignoring .idea and .github folders
Expand Down
12 changes: 5 additions & 7 deletions data/features.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
var list = require('postcss/lib/list')
var pats = {
attrcc: '[^\\~|^$*\\]]*',
brackets: /(\[[^\]]*\]|\([^\)]*\))/.source,
nobrackets: /[^\[\]\(\)]/.source
brackets: /\[[^\]]*\]|\([^\)]*\)/g
}

function matchOutsideOfBrackets(pat) {
if (!(pat instanceof RegExp)) {
throw new TypeError('matchOutsideOfBrackets expects a RegExp')
}
var fullPat = new RegExp(
'^(' + pats.brackets + '?' + pats.nobrackets + '*)*' + pat.source
)
return function match(str) {
return pat.test(str) && fullPat.test(str)

return function(str) {
return pat.test(str.replace(pats.brackets, ''))
}
}

Expand Down
41 changes: 35 additions & 6 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@babel/core": "^7.12.3",
"mock-fs": "^4.13.0",
"postcss-import": "^13.0.0",
"safe-regex": "^2.1.1",
"tape": "^5.0.1"
},
"scripts": {
Expand Down
26 changes: 26 additions & 0 deletions test/regex.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
const test = require('tape')
const safe = require('safe-regex')
const features = require('../data/features')

regexes = []

for (var feature of Object.values(features)) {
for (var property of Object.values(feature)) {
if (!property || !(property instanceof Array)){
continue;
}

for (var item of property) {
if (item instanceof RegExp) {
regexes.push(item)
}
}
}
}

for (var regex of regexes) {
test('Regex safety check: /' + regex.source + '/', function(t) {
t.ok(safe(regex))
t.end()
})
}