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

fix encoding and stack overflow

Browse Source
This commit is contained in:
Pavol Bielik 2015-01-25 15:20:50 +01:00
parent d9424d8794
commit b2198226dd
3 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/js_features.js
View File

@ -80,12 +80,12 @@ function processFile(file, print_ast, features, json_formatting, skip_minified)
try {
var output = UglifyJS.extractFeatures(code, file, print_ast, features, skip_minified);
} catch (ex){
if (ex instanceof UglifyJS.JS_Parse_Error){
sys.error("ERROR: ".red + "cannot parse file '" + file + "'");
} else if (ex instanceof UglifyJS.JS_Minified_Error){
if (ex instanceof UglifyJS.Parse_Error){
sys.error("ERROR: ".red + "cannot parse file '" + file + "': " + ex.message);
} else if (ex instanceof UglifyJS.Minified_Error){
//sys.error("WARN: ".yellow + "skipping minified file '" + file + "'");
} else {
sys.error("ERROR: ".red + "'" + file + "'" + ex);
sys.error("ERROR: ".red + "'" + file + "': " + ex);
}
return;

40
lib/feature_extractor.js
View File

@ -58,14 +58,22 @@ function replaceMangled(code, file) {
return stream.toString();
}
function JS_Minified_Error(message) {
function Minified_Error(message) {
this.message = message;
}
function Parse_Error(ex) {
this.message = ex.toString();
}
function extractFeatures(code, file, print_ast, features, skip_minified) {
var toplevel;
toplevel = parseFile(code, file);
try {
toplevel = parseFile(code, file);
} catch (ex){
throw new Parse_Error(ex);
}
extendAst(toplevel);
@ -74,7 +82,7 @@ function extractFeatures(code, file, print_ast, features, skip_minified) {
}
if (skip_minified && isMinified(toplevel, code, file)){
throw new JS_Minified_Error("Skipping minified file");
throw new Minified_Error("Skipping minified file");
//console.warn("Skipping minified file: '%s'", file);
//return null;
}
@ -104,7 +112,7 @@ function extractFeatures(code, file, print_ast, features, skip_minified) {
/* -----[ functions ]----- */
function nodeToString(node) {
function nodeToString(node, parent) {
if (node == null) return null;
if (node instanceof AST_Symbol){
@ -120,31 +128,37 @@ function nodeToString(node) {
return GIVEN + "!" + nodeType(node) + "!" + String(node.value).slice(0,64);
} else if (node instanceof AST_Sub){
//x[1], x -> expression, 1 -> property
return nodeToString(node.expression) + "[]";
return (nodeToString(node.expression, node) != null) ? nodeToString(node.expression, node) + "[]" : null;
} else if (node instanceof AST_PropAccess){
return GIVEN + node.property;
} else if (node instanceof AST_Defun) {
//function foo(...) { ... }
return nodeToString(node.name);
return nodeToString(node.name, node);
} else if (node instanceof AST_VarDef){
// var x = function () { ... }
return nodeToString(node.name);
return nodeToString(node.name, node);
} else if (node instanceof AST_Assign){
//x = function () { ... }
return nodeToString(node.left);
return nodeToString(node.left, node);
} else if (node instanceof AST_ObjectProperty){
// { "x" : function () { ... } }
return GIVEN + node.key;
} else if (node instanceof AST_Call){
//x.foo( function () { ... } )
//foo( function () { ... } )
return nodeToString(node.expression);
return nodeToString(node.expression, node);
} else if (node instanceof AST_Lambda) {
if (node.parent instanceof AST_Call){
//'node.parent.expression != node' as lambda can call itself
return (node.parent.expression == node) ? null : nodeToString(node.parent.expression) + "(" + node.child_id + ")";
if (node.parent.expression == node) {
return null;
}
return (nodeToString(node.parent.expression, node) != null) ? nodeToString(node.parent.expression, node) + "(" + node.child_id + ")" : null;
}
if (node.parent != parent) {
return nodeToString(node.parent, node);
}
return nodeToString(node.parent);
}
return null;
@ -544,7 +558,9 @@ StringMap.prototype.getId = function(input){
/* ------------------------ */
function escapeString(input){
return encodeURIComponent(input);
//escape method escapes certain characters that encodeURIComponent cannot process
//unescape is used to make the resulting string smaller
return unescape(encodeURIComponent(escape(input)));
}
function parseFile(code, file) {

2
lib/parse.js
View File

@ -196,7 +196,7 @@ function JS_Parse_Error(message, line, col, pos) {
};
JS_Parse_Error.prototype.toString = function() {
return this.message + " (line: " + this.line + ", col: " + this.col + ", pos: " + this.pos + ")" + "\n\n" + this.stack;
return this.message + " (line: " + this.line + ", col: " + this.col + ", pos: " + this.pos + ")";// + "\n\n" + this.stack;
};
function js_error(message, filename, line, col, pos) {