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

fix crash on missing props to string_template() (#1523)

Browse Source 
Patched up `make_node()` without `orig`.

There may be other cases where `start` could be missing, so make it print "undefined" instead of crashing.

fixes #1518
This commit is contained in:
Alex Lam S.L
2017-03-01 15:25:26 +08:00
committed by GitHub
parent fb2b6c7c6f
commit c2334baa48
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/compress.js
View File

@@ -2194,7 +2194,7 @@ merge(Compressor.prototype, {
// here because they are only used in an equality comparison later on. // here because they are only used in an equality comparison later on.
self.condition = negated; self.condition = negated;
var tmp = self.body; var tmp = self.body;
self.body = self.alternative || make_node(AST_EmptyStatement); self.body = self.alternative || make_node(AST_EmptyStatement, self);
self.alternative = tmp; self.alternative = tmp;
} }
if (is_empty(self.body) && is_empty(self.alternative)) { if (is_empty(self.body) && is_empty(self.alternative)) {
@@ -2459,7 +2459,7 @@ merge(Compressor.prototype, {
case "Boolean": case "Boolean":
if (self.args.length == 0) return make_node(AST_False, self); if (self.args.length == 0) return make_node(AST_False, self);
if (self.args.length == 1) return make_node(AST_UnaryPrefix, self, { if (self.args.length == 1) return make_node(AST_UnaryPrefix, self, {
expression: make_node(AST_UnaryPrefix, null, { expression: make_node(AST_UnaryPrefix, self, {
expression: self.args[0], expression: self.args[0],
operator: "!" operator: "!"
}), }),
@@ -2855,7 +2855,7 @@ merge(Compressor.prototype, {
compressor.warn("Boolean && always false [{file}:{line},{col}]", self.start); compressor.warn("Boolean && always false [{file}:{line},{col}]", self.start);
return make_node(AST_Seq, self, { return make_node(AST_Seq, self, {
car: self.left, car: self.left,
cdr: make_node(AST_False) cdr: make_node(AST_False, self)
}).optimize(compressor); }).optimize(compressor);
} }
if (ll.length > 1 && ll[1]) { if (ll.length > 1 && ll[1]) {

2
lib/utils.js
View File

@@ -185,7 +185,7 @@ function push_uniq(array, el) {
function string_template(text, props) { function string_template(text, props) {
return text.replace(/\{(.+?)\}/g, function(str, p){ return text.replace(/\{(.+?)\}/g, function(str, p){
return props[p]; return props && props[p];
}); });
}; };