Skip to content

lib: refactor to avoid unsafe regex primordials #43475

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
aduh95 merged 3 commits into from
Jun 27, 2022
Merged

lib: refactor to avoid unsafe regex primordials #43475

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
929593c
lib: refactor to avoid unsafe regex primordials
aduh95 Jun 17, 2022
ef6fc53
fixup! lib: refactor to avoid unsafe regex primordials
aduh95 Jun 18, 2022
b3fad29
revert changes in `internal/net` to fix perf regression
aduh95 Jun 20, 2022
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
Prev Previous commit
Next Next commit
fixup! lib: refactor to avoid unsafe regex primordials
  • Loading branch information
@aduh95
aduh95 committed Jun 18, 2022
commit ef6fc5378438d5987133c8c3fa44ec3d93dc8886
6 changes: 3 additions & 3 deletions lib/internal/errors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ const {
RangeError,
ReflectApply,
RegExpPrototypeExec,
RegExpPrototypeSymbolMatch,
SafeArrayIterator,
SafeMap,
SafeWeakMap,
Expand Down Expand Up @@ -438,8 +437,9 @@ function getMessage(key, args, self) {
return ReflectApply(msg, self, args);
}

// eslint-disable-next-line node-core/avoid-prototype-pollution
const expectedLength = RegExpPrototypeSymbolMatch(/%[dfijoOs]/g, msg).length;
const regex = /%[dfijoOs]/g;
let expectedLength = 0;
while (RegExpPrototypeExec(regex, msg) !== null) expectedLength++;
assert(
expectedLength === args.length,
`Code: ${key}; The provided arguments length (${args.length}) does not ` +
Expand Down
12 changes: 7 additions & 5 deletions lib/repl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ const {
ReflectApply,
RegExp,
RegExpPrototypeExec,
RegExpPrototypeSymbolMatch,
RegExpPrototypeSymbolReplace,
RegExpPrototypeSymbolSplit,
SafeSet,
Expand Down Expand Up @@ -1641,13 +1640,16 @@ function _memory(cmd) {
// I need to know "depth."
// Because I can not tell the difference between a } that
// closes an object literal and a } that closes a function
const countMatches = (regex, str) => {
let count = 0;
while (RegExpPrototypeExec(regex, str) !== null) count++;
return count;
};

// Going down is { and ( e.g. function() {
// going up is } and )
// eslint-disable-next-line node-core/avoid-prototype-pollution
const dw = RegExpPrototypeSymbolMatch(/[{(]/g, cmd);
// eslint-disable-next-line node-core/avoid-prototype-pollution
const up = RegExpPrototypeSymbolMatch(/[})]/g, cmd);
const dw = countMatches(/[{(]/g, cmd);
const up = countMatches(/[})]/g, cmd);
let depth = dw.length - up.length;

if (depth) {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-errors-systemerror.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ assert.throws(
() => { new SystemError(); },
{
name: 'TypeError',
message: 'String.prototype.match called on null or undefined'
message: "Cannot read properties of undefined (reading 'syscall')",
}
);

Expand Down