Magic-Mirror/dex2jar
1
0
Fork 0
mirror of https://github.com/pxb1988/dex2jar.git synced 2024-11-23 13:19:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug on MultiArrayTransformer

Browse Source
This commit is contained in:
Bob Pan 2016-03-04 20:00:17 +08:00
parent 0d48e49275
commit 8e58b0eb40
1 changed files with 75 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/MultiArrayTransformer.java
View File

@ -4,8 +4,6 @@ import com.googlecode.dex2jar.ir.IrMethod;
import com.googlecode.dex2jar.ir.StmtTraveler;
import com.googlecode.dex2jar.ir.expr.*;
import java.lang.reflect.Array;
/**
* dex does have the instruction to create a multi-array. the implement is to
* using the Array.newInstance().
@ -25,7 +23,18 @@ public class MultiArrayTransformer extends StatedTransformer {
new StmtTraveler() {
@Override
public Value travel(Value op) {
if (op.vt == Value.VT.CHECK_CAST) {
TypeExpr te = (TypeExpr) op;
if (te.op.vt == Value.VT.CHECK_CAST) {
TypeExpr te2 = (TypeExpr) te.op;
if (te.type.equals(te2.type)) {
op = te2;
}
}
}
op = super.travel(op);
if (op.vt == Value.VT.CHECK_CAST) {
TypeExpr te = (TypeExpr) op;
if (te.type.charAt(0) == '[') {
@ -35,36 +44,75 @@ public class MultiArrayTransformer extends StatedTransformer {
if (invokeExpr.name.equals("newInstance")
&& invokeExpr.owner.equals("Ljava/lang/reflect/Array;")
&& invokeExpr.args.length == 2
&& invokeExpr.args[0].equals("Ljava/lang/Class;")
&& invokeExpr.getOps()[0].vt == Value.VT.CONSTANT
) {
String elementType = ((Constant.Type) ((Constant) invokeExpr.getOps()[0]).value).desc;
Value dt = invokeExpr.getOps()[1];
if (invokeExpr.args[1].equals("I")) {
if (te.type.equals("[" + elementType)) {
int d = 0;
while (elementType.charAt(d) == '[') {
d++;
}
changed[0] = true;
if (d > 0) {
return Exprs.nNewMutiArray(elementType.substring(d), d + 1, new Value[]{dt});
} else {
return Exprs.nFilledArray(elementType, new Value[]{dt});
&& invokeExpr.args[0].equals("Ljava/lang/Class;")) {
Value arg0 = invokeExpr.getOps()[0];
String elementType = null;
if (arg0.vt == Value.VT.CONSTANT) {
elementType = ((Constant.Type) ((Constant) invokeExpr.getOps()[0]).value).desc;
} else {
if (arg0.vt == Value.VT.STATIC_FIELD) {
StaticFieldExpr sfe = (StaticFieldExpr) arg0;
if (sfe.owner.startsWith("Ljava/lang/") && sfe.name.equals("TYPE")) {
switch (sfe.owner) {
case "Ljava/lang/Boolean;":
elementType = "Z";
break;
case "Ljava/lang/Byte;":
elementType = "B";
break;
case "Ljava/lang/Short;":
elementType = "S";
break;
case "Ljava/lang/Character;":
elementType = "C";
break;
case "Ljava/lang/Integer;":
elementType = "I";
break;
case "Ljava/lang/Long;":
elementType = "J";
break;
case "Ljava/lang/Float;":
elementType = "F";
break;
case "Ljava/lang/Double;":
elementType = "D";
break;
case "Ljava/lang/Void;":
elementType = "V";
break;
default:
}
}
}
} else {// [I
if (dt.vt == Value.VT.FILLED_ARRAY) {
FilledArrayExpr filledArrayExpr = (FilledArrayExpr) dt;
int d = filledArrayExpr.getOps().length;
if (te.type.length() > d && te.type.substring(d).equals(elementType)) {
int d1 = 0;
}
if (elementType != null) {
Value dt = invokeExpr.getOps()[1];
if (invokeExpr.args[1].equals("I")) {
if (te.type.equals("[" + elementType)) {
int d = 0;
while (elementType.charAt(d) == '[') {
d1++;
d++;
}
changed[0] = true;
return Exprs.nNewMutiArray(elementType.substring(d1), d1 + d, filledArrayExpr.getOps());
if (d > 0) {
return Exprs.nNewMutiArray(elementType.substring(d), d + 1, new Value[]{dt});
} else {
return Exprs.nNewArray(elementType, dt);
}
}
} else {// [I
if (dt.vt == Value.VT.FILLED_ARRAY) {
FilledArrayExpr filledArrayExpr = (FilledArrayExpr) dt;
int d = filledArrayExpr.getOps().length;
if (te.type.length() > d && te.type.substring(d).equals(elementType)) {
int d1 = 0;
while (elementType.charAt(d1) == '[') {
d1++;
}
changed[0] = true;
return Exprs.nNewMutiArray(elementType.substring(d1), d1 + d, filledArrayExpr.getOps());
}
}
}
}