JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix suspicious toplevel detection (#3902)

Browse Source
This commit is contained in:
Alex Lam S.L
2020-05-17 14:35:17 +01:00
committed by GitHub
parent 9daa2fb6f5
commit a00f8dade7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/ufuzz/index.js
View File

@@ -1018,6 +1018,7 @@ function log_suspects(minify_options, component) {
if (!options) return; if (!options) return;
if (typeof options != "object") options = {}; if (typeof options != "object") options = {};
var defs = default_options[component]; var defs = default_options[component];
var toplevel = sandbox.has_toplevel(minify_options);
var suspects = Object.keys(defs).filter(function(name) { var suspects = Object.keys(defs).filter(function(name) {
var flip = name == "keep_fargs"; var flip = name == "keep_fargs";
if (flip !== (name in options ? options : defs)[name]) { if (flip !== (name in options ? options : defs)[name]) {
@@ -1030,7 +1031,7 @@ function log_suspects(minify_options, component) {
errorln("Error testing options." + component + "." + name); errorln("Error testing options." + component + "." + name);
errorln(result.error); errorln(result.error);
} else { } else {
var r = sandbox.run_code(result.code, sandbox.has_toplevel(m)); var r = sandbox.run_code(result.code, toplevel);
return !sandbox.same_stdout(uglify_result, r); return !sandbox.same_stdout(uglify_result, r);
} }
} }
@@ -1044,7 +1045,7 @@ function log_suspects(minify_options, component) {
} }
} }
function log_suspects_global(options) { function log_suspects_global(options, toplevel) {
var suspects = Object.keys(default_options).filter(function(component) { var suspects = Object.keys(default_options).filter(function(component) {
return typeof default_options[component] != "object"; return typeof default_options[component] != "object";
}).filter(function(component) { }).filter(function(component) {
@@ -1055,7 +1056,7 @@ function log_suspects_global(options) {
errorln("Error testing options." + component); errorln("Error testing options." + component);
errorln(result.error); errorln(result.error);
} else { } else {
var r = sandbox.run_code(result.code, sandbox.has_toplevel(m)); var r = sandbox.run_code(result.code, toplevel);
return !sandbox.same_stdout(uglify_result, r); return !sandbox.same_stdout(uglify_result, r);
} }
}); });
@@ -1117,7 +1118,7 @@ function log(options) {
var defs = default_options[component]; var defs = default_options[component];
return defs && typeof defs == "object"; return defs && typeof defs == "object";
}).forEach(log_suspects.bind(null, JSON.parse(options))); }).forEach(log_suspects.bind(null, JSON.parse(options)));
log_suspects_global(options); log_suspects_global(options, toplevel);
errorln("!!!!!! Failed... round " + round); errorln("!!!!!! Failed... round " + round);
} }
} }