[FIX] Smali parser ignores goto label inserted into array statement

FrenchYeti · Apr 2, 2021 · b9d5f25 · b9d5f25
1 parent 132d55e
commit b9d5f25
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/src/SmaliParser.js b/src/SmaliParser.js
@@ -476,12 +476,30 @@ class SmaliParser
                     this.__tmp_block.setAsConditionalBlock(sml[0].split('_')[1]);
 
                 }else if(sml[0].indexOf(':goto_')>-1){
-                    if(this.__tmp_block instanceof CLASS.DataBlock || this.__tmp_block.stack.length>0){
+                    if(this.__tmp_block instanceof CLASS.DataBlock){
+                        if(this.__tmp_block.width!=null){
+                            this.__tmp_meth.appendBlock(this.__tmp_block, this.__appendBlock_callback);
+                            this.__tmp_block = new CLASS.BasicBlock();
+                            this.__tmp_block.setAsGotoBlock(sml[0].split('_')[1]);
+                        }else{
+                            // ignore this case :  invalid smali :
+                            /*
+                            :array_XX
+                            :goto_BB <--- invalid
+                            .array-data A
+                             */
+                        }
+                    }
+                    else if(this.__tmp_block.stack.length>0){
                         this.__tmp_meth.appendBlock(this.__tmp_block, this.__appendBlock_callback);
                         this.__tmp_block = new CLASS.BasicBlock();
+                        this.__tmp_block.setAsGotoBlock(sml[0].split('_')[1]);
+                    }
+                    else{
+
+                        this.__tmp_block.setAsGotoBlock(sml[0].split('_')[1]);
                     }
                     //this.__tmp_block.tag = sml[0];
-                    this.__tmp_block.setAsGotoBlock(sml[0].split('_')[1]);
 
                 }
                 else if(sml[0].indexOf(':try_start')>-1){