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

Implemented verification for sget-object

Browse Source 
git-svn-id: https://smali.googlecode.com/svn/trunk@602 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
This commit is contained in:
JesusFreke@JesusFreke.com 2010-01-27 04:56:23 +00:00
parent 2f233fefd9
commit 2d6d6eb22c
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -568,6 +568,8 @@ public class MethodAnalyzer {
return handle32BitPrimitiveSget(analyzedInstruction, RegisterType.Category.Short); return handle32BitPrimitiveSget(analyzedInstruction, RegisterType.Category.Short);
case SGET_WIDE: case SGET_WIDE:
return handleSgetWide(analyzedInstruction); return handleSgetWide(analyzedInstruction);
case SGET_OBJECT:
return handleSgetObject(analyzedInstruction);
} }
assert false; assert false;
@ -2032,6 +2034,25 @@ public class MethodAnalyzer {
return true; return true;
} }
private boolean handleSgetObject(AnalyzedInstruction analyzedInstruction) {
//TODO: check access
Item referencedItem = ((InstructionWithReference)analyzedInstruction.instruction).getReferencedItem();
assert referencedItem instanceof FieldIdItem;
FieldIdItem field = (FieldIdItem)referencedItem;
RegisterType fieldType = RegisterType.getRegisterTypeForTypeIdItem(field.getFieldType());
if (fieldType.category != RegisterType.Category.Reference) {
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, fieldType);
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) {