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

fix corner case in unsafe evaluate (#4932)

Browse Source 
fixes #4931
This commit is contained in:
Alex Lam S.L
2021-05-14 15:51:19 +01:00
committed by GitHub
parent 3c1898fd65
commit 7576048118
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/compress.js
View File

@@ -10778,7 +10778,8 @@ merge(Compressor.prototype, {
OPT(AST_Template, function(self, compressor) { OPT(AST_Template, function(self, compressor) {
if (!compressor.option("templates")) return self; if (!compressor.option("templates")) return self;
if (!self.tag || is_raw_tag(compressor, self.tag)) { var tag = self.tag;
if (!tag || is_raw_tag(compressor, tag)) {
var exprs = self.expressions.slice(); var exprs = self.expressions.slice();
var strs = self.strings.slice(); var strs = self.strings.slice();
var CHANGED = false; var CHANGED = false;
@@ -10786,6 +10787,7 @@ merge(Compressor.prototype, {
var node = exprs[i]; var node = exprs[i];
var ev = node.evaluate(compressor); var ev = node.evaluate(compressor);
if (ev === node) continue; if (ev === node) continue;
if (tag && /\r|\\|`/.test(ev)) continue;
ev = ("" + ev).replace(/\r|\\|`/g, function(s) { ev = ("" + ev).replace(/\r|\\|`/g, function(s) {
return "\\" + (s == "\r" ? "r" : s); return "\\" + (s == "\r" ? "r" : s);
}); });
@@ -10794,11 +10796,11 @@ merge(Compressor.prototype, {
if (typeof make_node(AST_Template, self, { if (typeof make_node(AST_Template, self, {
expressions: [], expressions: [],
strings: [ combined ], strings: [ combined ],
tag: self.tag, tag: tag,
}).evaluate(compressor) != typeof make_node(AST_Template, self, { }).evaluate(compressor) != typeof make_node(AST_Template, self, {
expressions: [ node ], expressions: [ node ],
strings: strs.slice(i, i + 2), strings: strs.slice(i, i + 2),
tag: self.tag, tag: tag,
}).evaluate(compressor)) continue; }).evaluate(compressor)) continue;
exprs.splice(i, 1); exprs.splice(i, 1);
strs.splice(i, 2, combined); strs.splice(i, 2, combined);

21
test/compress/templates.js
View File

@@ -398,3 +398,24 @@ issue_4676: {
expect_stdout: "PASS" expect_stdout: "PASS"
node_version: ">=4" node_version: ">=4"
} }
issue_4931: {
options = {
evaluate: true,
templates: true,
unsafe: true,
}
input: {
console.log(String.raw`${typeof A} ${"\r"}`);
console.log(String.raw`${"\\"} ${"`"}`);
}
expect: {
console.log(String.raw`${typeof A} ${"\r"}`);
console.log("\\ `");
}
expect_stdout: [
"undefined \r",
"\\ `",
]
node_version: ">=4"
}