Skip to content
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

Jump to bottom

fix(es/minifier): Abort eval on valueOf or toString #8763

Merged
merged 7 commits into from
Mar 20, 2024
Merged

fix(es/minifier): Abort eval on valueOf or toString #8763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
63d9e2a
Add a test
kdy1 Mar 20, 2024
3292cb7
Add a test
kdy1 Mar 20, 2024
0513dfe
Add a test
kdy1 Mar 20, 2024
860f53d
fix
kdy1 Mar 20, 2024
ce99c4a
fix
kdy1 Mar 20, 2024
16ca7d5
Update test refs
kdy1 Mar 20, 2024
7be2b33
Remove some tests
kdy1 Mar 20, 2024
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
64 changes: 64 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8705/input/.swcrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"jsc": {
"parser": {
"syntax": "ecmascript",
"jsx": false
},
"target": "es2022",
"loose": false,
"minify": {
"compress": {
"arguments": false,
"arrows": true,
"booleans": true,
"booleans_as_integers": false,
"collapse_vars": true,
"comparisons": true,
"computed_props": true,
"conditionals": true,
"dead_code": true,
"directives": true,
"drop_console": false,
"drop_debugger": true,
"evaluate": true,
"expression": false,
"hoist_funs": false,
"hoist_props": true,
"hoist_vars": false,
"if_return": true,
"join_vars": true,
"keep_classnames": false,
"keep_fargs": true,
"keep_fnames": false,
"keep_infinity": false,
"loops": true,
"negate_iife": true,
"properties": true,
"reduce_funcs": false,
"reduce_vars": false,
"side_effects": true,
"switches": true,
"typeofs": true,
"unsafe": false,
"unsafe_arrows": false,
"unsafe_comps": false,
"unsafe_Function": false,
"unsafe_math": false,
"unsafe_symbols": false,
"unsafe_methods": false,
"unsafe_proto": false,
"unsafe_regexp": false,
"unsafe_undefined": false,
"unused": true,
"const_to_let": true,
"pristine_globals": true
},
"mangle": false
}
},
"module": {
"type": "es6"
},
"minify": false,
"isModule": true
}
1 change: 1 addition & 0 deletions crates/swc/tests/fixture/issues-8xxx/8705/input/1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log(Math.pow({ valueOf() { return 42 } }, 1))
3 changes: 3 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8705/output/1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
console.log(Math.pow({
valueOf: ()=>42
}, 1));
47 changes: 47 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/8704/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"defaults": true,
"arguments": false,
"arrows": true,
"booleans": true,
"booleans_as_integers": false,
"collapse_vars": true,
"comparisons": true,
"computed_props": true,
"conditionals": true,
"dead_code": true,
"directives": true,
"drop_console": false,
"drop_debugger": true,
"evaluate": true,
"expression": false,
"hoist_funs": false,
"hoist_props": true,
"hoist_vars": false,
"if_return": true,
"join_vars": true,
"keep_classnames": false,
"keep_fargs": true,
"keep_fnames": false,
"keep_infinity": false,
"loops": true,
"negate_iife": true,
"properties": true,
"reduce_funcs": false,
"reduce_vars": false,
"side_effects": true,
"switches": true,
"typeofs": true,
"unsafe": false,
"unsafe_arrows": false,
"unsafe_comps": false,
"unsafe_Function": false,
"unsafe_math": false,
"unsafe_symbols": false,
"unsafe_methods": false,
"unsafe_proto": false,
"unsafe_regexp": false,
"unsafe_undefined": false,
"unused": true,
"const_to_let": true,
"pristine_globals": true
}
1 change: 1 addition & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/8704/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log({ toString() { return 'swc' } } + '')
3 changes: 3 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/8704/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
console.log({
toString: ()=>'swc'
} + '');
47 changes: 47 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/8705/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"defaults": true,
"arguments": false,
"arrows": true,
"booleans": true,
"booleans_as_integers": false,
"collapse_vars": true,
"comparisons": true,
"computed_props": true,
"conditionals": true,
"dead_code": true,
"directives": true,
"drop_console": false,
"drop_debugger": true,
"evaluate": true,
"expression": false,
"hoist_funs": false,
"hoist_props": true,
"hoist_vars": false,
"if_return": true,
"join_vars": true,
"keep_classnames": false,
"keep_fargs": true,
"keep_fnames": false,
"keep_infinity": false,
"loops": true,
"negate_iife": true,
"properties": true,
"reduce_funcs": false,
"reduce_vars": false,
"side_effects": true,
"switches": true,
"typeofs": true,
"unsafe": false,
"unsafe_arrows": false,
"unsafe_comps": false,
"unsafe_Function": false,
"unsafe_math": false,
"unsafe_symbols": false,
"unsafe_methods": false,
"unsafe_proto": false,
"unsafe_regexp": false,
"unsafe_undefined": false,
"unused": true,
"const_to_let": true,
"pristine_globals": true
}
1 change: 1 addition & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/8705/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log(Math.pow({ valueOf() { return 42 } }, 1))
3 changes: 3 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/8705/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
console.log(Math.pow({
valueOf: ()=>42
}, 1));
4 changes: 0 additions & 4 deletions crates/swc_ecma_transforms_optimization/src/simplify/expr/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,10 +661,6 @@ fn test_folding_mix_types_early() {
fn test_folding_add1() {
fold("x = null + true", "x=1");
fold_same("x = a + true");
fold("x = '' + {}", "x = \"[object Object]\"");
fold("x = [] + {}", "x = \"[object Object]\"");
fold("x = {} + []", "x = \"[object Object]\"");
fold("x = {} + ''", "x = \"[object Object]\"");
}

#[test]
Expand Down
3 changes: 1 addition & 2 deletions crates/swc_ecma_utils/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ pub trait ExprExt {
}
}

Expr::Tpl(..) | Expr::Object(ObjectLit { .. }) | Expr::Array(ArrayLit { .. }) => {
Expr::Tpl(..) => {
return (
Pure,
num_from_str(&match self.as_pure_string(ctx) {
Expand Down Expand Up @@ -1058,7 +1058,6 @@ pub trait ExprExt {
}
Known(buf.into())
}
Expr::Object(ObjectLit { .. }) => Known(Cow::Borrowed("[object Object]")),
_ => Unknown,
}
}
Expand Down
Loading