ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-11-07 21:27:00 +01:00
Code Issues Projects Releases Wiki Activity

Add support for non-standard invoke-object-init/range instructions

Browse Source
This commit is contained in:
Ben Gruver 2014-02-02 19:29:26 -08:00 committed by Connor Tumbleson
parent 83e63dab7a
commit 9596513f6f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/analysis/MethodAnalyzer.java
View File

@ -1493,8 +1493,11 @@ public class MethodAnalyzer {
Instruction deodexedInstruction;
int startRegister = instruction.getStartRegister();
int registerCount = instruction.getRegisterCount();
if (registerCount == 1 && startRegister < 16) {
// hack: we should be using instruction.getRegisterCount, but some tweaked versions of dalvik appear
// to generate invoke-object-init/range instructions with an invalid register count. We know it should
// always be 1, so just use that.
int registerCount = 1;
if (startRegister < 16) {
deodexedInstruction = new ImmutableInstruction35c(Opcode.INVOKE_DIRECT,
registerCount, startRegister, 0, 0, 0, 0, instruction.getReference());
} else {