Merge pull request #14 from 0x1Avram/dev

add transpilation message for esprima incompatible input; stringarray…

Author: 0x1Avram

Stages/stage_03_stringarray.js

@@ -1267,7 +1267,8 @@ class StringArrayCallsReplacer{
                 }
                 firstNode = false;
 
-                if((node.type == 'Identifier') && (node.name == wrapperName) && (parent.type == 'VariableDeclarator')){
+                if((node.type == 'Identifier') && (node.name == wrapperName) 
+                   && (parent.type == 'VariableDeclarator') && (parent.id.name == wrapperName)){
                     foundRedefined = true;
                     this.break();
                 }
@@ -1328,7 +1329,12 @@ class StringArrayCallsReplacer{
             node = parent;
         }while(parent.type != 'Program');
 
-        return false;
+        if(parent == wrapperLexicalScope){
+            return true;
+        }
+        else{
+            return false;
+        }
     }
 
     _removeVariableDeclaratorWrappers(wrappers){

deobfuscator.js

@@ -27,7 +27,16 @@ class SourceCodeDeobfuscator{
     }
 
     deobfuscate(){
-        this._generateASTFromObfuscatedSourceCode();
+        try{
+            this._generateASTFromObfuscatedSourceCode();
+        }
+        catch(e){
+            this.logger.error(`[deobfuscator.js] Error when transforming the input source code to AST.`
+                              + ` This is an 'esprima' parser limitation and the code needs to be`
+                              + ` transpiled to an esprima compatible version before passing it to`
+                              + ` the deobfuscator. error = ${e}. Stack = ${e.stack}`);
+            return '';
+        }
         this._deobfuscateAST();
         this._generateSourceCodeFromDeobfuscatedAST();
         return this.deobfuscatedSourceCode;