ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-05 09:04:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implemented verification for sget/sget-boolean/sget-byte/sget-char/sget-short

Browse Source 
git-svn-id: https://smali.googlecode.com/svn/trunk@599 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
This commit is contained in:
JesusFreke@JesusFreke.com 2010-01-27 04:37:16 +00:00
parent 50ff624741
commit 052f4890ab
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dexlib/src/main/java/org/jf/dexlib/Code/Analysis/MethodAnalyzer.java
View File

@ -556,6 +556,16 @@ public class MethodAnalyzer {
return handleIputWide(analyzedInstruction); return handleIputWide(analyzedInstruction);
case IPUT_OBJECT: case IPUT_OBJECT:
return handleIputObject(analyzedInstruction); return handleIputObject(analyzedInstruction);
case SGET:
return handle32BitPrimitiveSget(analyzedInstruction, RegisterType.Category.Integer);
case SGET_BOOLEAN:
return handle32BitPrimitiveSget(analyzedInstruction, RegisterType.Category.Boolean);
case SGET_BYTE:
return handle32BitPrimitiveSget(analyzedInstruction, RegisterType.Category.Byte);
case SGET_CHAR:
return handle32BitPrimitiveSget(analyzedInstruction, RegisterType.Category.Char);
case SGET_SHORT:
return handle32BitPrimitiveSget(analyzedInstruction, RegisterType.Category.Short);
} }
assert false; assert false;
@ -1977,6 +1987,30 @@ public class MethodAnalyzer {
return true; return true;
} }
private boolean handle32BitPrimitiveSget(AnalyzedInstruction analyzedInstruction,
RegisterType.Category instructionCategory) {
SingleRegisterInstruction instruction = (SingleRegisterInstruction)analyzedInstruction.instruction;
//TODO: check access
//TODO: allow an uninitialized "this" reference, if the current method is an <init> method
Item referencedItem = ((InstructionWithReference)analyzedInstruction.instruction).getReferencedItem();
assert referencedItem instanceof FieldIdItem;
FieldIdItem field = (FieldIdItem)referencedItem;
RegisterType fieldType = RegisterType.getRegisterTypeForTypeIdItem(field.getFieldType());
if (!checkArrayFieldAssignment(fieldType.category, instructionCategory)) {
throw new ValidationException(String.format("Cannot use %s with field %s. Incorrect field type " +
"for the instruction.", analyzedInstruction.instruction.opcode.name,
field.getFieldString()));
}
setDestinationRegisterTypeAndPropagateChanges(analyzedInstruction,
RegisterType.getRegisterType(instructionCategory, null));
return true;
}
private static boolean checkArrayFieldAssignment(RegisterType.Category arrayFieldCategory, private static boolean checkArrayFieldAssignment(RegisterType.Category arrayFieldCategory,
RegisterType.Category instructionCategory) { RegisterType.Category instructionCategory) {
if (arrayFieldCategory == instructionCategory) { if (arrayFieldCategory == instructionCategory) {