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

support divide by zeor

Browse Source 
--HG--
branch : 2.x
This commit is contained in:
Bob Pan 2015-05-02 14:17:39 +08:00
parent 94e9fa04e2
commit d4746863a9
2 changed files with 109 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dex-ir/src/main/java/com/googlecode/dex2jar/ir/StmtSearcher.java Normal file
View File

@ -0,0 +1,53 @@
package com.googlecode.dex2jar.ir;
import com.googlecode.dex2jar.ir.expr.Value;
import com.googlecode.dex2jar.ir.stmt.Stmt;
import com.googlecode.dex2jar.ir.stmt.StmtList;
public class StmtSearcher {
public void travel(StmtList stmts) {
for (Stmt stmt : stmts) {
travel(stmt);
}
}
public void travel(Stmt stmt) {
switch (stmt.et) {
case E0:
break;
case E1:
travel(stmt.getOp());
break;
case E2:
travel(stmt.getOp1());
travel(stmt.getOp2());
break;
case En:
Value[] ops = stmt.getOps();
for (Value op : ops) {
travel(op);
}
break;
}
}
public void travel(Value op) {
switch (op.et) {
case E0:
break;
case E1:
travel(op.getOp());
break;
case E2:
travel(op.getOp1());
travel(op.getOp2());
break;
case En:
Value[] ops = op.getOps();
for (Value op1 : ops) {
travel(op1);
}
break;
}
}
}

72
dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/NpeTransformer.java
View File

@ -17,6 +17,7 @@
package com.googlecode.dex2jar.ir.ts;
import com.googlecode.dex2jar.ir.IrMethod;
import com.googlecode.dex2jar.ir.StmtSearcher;
import com.googlecode.dex2jar.ir.StmtTraveler;
import com.googlecode.dex2jar.ir.expr.Constant;
import com.googlecode.dex2jar.ir.expr.Exprs;
@ -26,14 +27,16 @@ import com.googlecode.dex2jar.ir.stmt.Stmt;
import com.googlecode.dex2jar.ir.stmt.Stmts;
/**
* Replace MUST be NullPointerException stmt to 'throw new NullPointerException()' run after {@link SSATransformer} and
* {@link RemoveConstantFromSSA}
* Replace MUST be NullPointerException stmt to 'throw new NullPointerException()'
*
* Replace MUST be 'divide by zero' stmt to 'throw new ArithmeticException("divide by zero")'
*/
public class NpeTransformer extends StatedTransformer {
private static class XNPE extends RuntimeException {
private static class MustThrowException extends RuntimeException {
}
private static final XNPE NPE = new XNPE();
private static final MustThrowException NPE = new MustThrowException();
private static final MustThrowException DIVE = new MustThrowException();
@Override
public boolean transformReportChanged(IrMethod method) {
@ -41,19 +44,19 @@ public class NpeTransformer extends StatedTransformer {
if (method.locals.size() == 0) {
return false;
}
StmtTraveler st = new StmtTraveler() {
StmtSearcher st = new StmtSearcher() {
@Override
public Stmt travel(Stmt stmt) {
public void travel(Stmt stmt) {
if (stmt.st == Stmt.ST.FILL_ARRAY_DATA) {
if (isNull(stmt.getOp1())) {
throw NPE;
}
}
return super.travel(stmt);
super.travel(stmt);
}
@Override
public Value travel(Value op) {
public void travel(Value op) {
switch (op.vt) {
case INVOKE_VIRTUAL:
case INVOKE_SPECIAL:
@ -75,9 +78,24 @@ public class NpeTransformer extends StatedTransformer {
}
}
break;
case IDIV:
if (op.getOp2().vt == Value.VT.CONSTANT) {
Constant constant = (Constant) op.getOp2();
if (((Number) constant.value).intValue() == 0) {
throw DIVE;
}
}
break;
case LDIV:
if (op.getOp2().vt == Value.VT.CONSTANT) {
Constant constant = (Constant) op.getOp2();
if (((Number) constant.value).longValue() == 0) {
throw DIVE;
}
}
break;
default:
}
return op;
}
};
@ -85,19 +103,18 @@ public class NpeTransformer extends StatedTransformer {
try {
st.travel(p);
p = p.getNext();
} catch (XNPE e) {
npe(method, p);
} catch (MustThrowException e) {
replace(method, p);
Stmt q = p.getNext();
method.stmts.remove(p);
changed = true;
p = q;
}
}
return changed;
}
private void npe(final IrMethod m, final Stmt p) {
private void replace(final IrMethod m, final Stmt p) {
StmtTraveler traveler = new StmtTraveler() {
@Override
public Value travel(Value op) {
@ -127,6 +144,24 @@ public class NpeTransformer extends StatedTransformer {
}
}
break;
case IDIV:
if (op.getOp2().vt == Value.VT.CONSTANT) {
Constant constant = (Constant) op.getOp2();
if (((Number) constant.value).intValue() == 0) {
travel(op.getOp1());
throw DIVE;
}
}
break;
case LDIV:
if (op.getOp2().vt == Value.VT.CONSTANT) {
Constant constant = (Constant) op.getOp2();
if (((Number) constant.value).longValue() == 0) {
travel(op.getOp1());
throw DIVE;
}
}
break;
default:
}
Value sop = super.travel(op);
@ -177,9 +212,14 @@ public class NpeTransformer extends StatedTransformer {
break;
case En:
}
} catch (XNPE e) {
m.stmts.insertBefore(p,
Stmts.nThrow(Exprs.nInvokeNew(new Value[0], new String[0], "Ljava/lang/NullPointerException;")));
} catch (MustThrowException e) {
if (e == NPE) {
m.stmts.insertBefore(p,
Stmts.nThrow(Exprs.nInvokeNew(new Value[0], new String[0], "Ljava/lang/NullPointerException;")));
} else {
m.stmts.insertBefore(p,
Stmts.nThrow(Exprs.nInvokeNew(new Value[]{Exprs.nString("divide by zero")}, new String[]{"Ljava/lang/String;"}, "Ljava/lang/ArithmeticException;")));
}
}
}