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

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

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

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

@ -570,6 +570,16 @@ public class MethodAnalyzer {
return handleSgetWide(analyzedInstruction); return handleSgetWide(analyzedInstruction);
case SGET_OBJECT: case SGET_OBJECT:
return handleSgetObject(analyzedInstruction); return handleSgetObject(analyzedInstruction);
case SPUT:
return handle32BitPrimitiveSput(analyzedInstruction, RegisterType.Category.Integer);
case SPUT_BOOLEAN:
return handle32BitPrimitiveSput(analyzedInstruction, RegisterType.Category.Boolean);
case SPUT_BYTE:
return handle32BitPrimitiveSput(analyzedInstruction, RegisterType.Category.Byte);
case SPUT_CHAR:
return handle32BitPrimitiveSput(analyzedInstruction, RegisterType.Category.Char);
case SPUT_SHORT:
return handle32BitPrimitiveSput(analyzedInstruction, RegisterType.Category.Short);
} }
assert false; assert false;
@ -2053,6 +2063,46 @@ public class MethodAnalyzer {
return true; return true;
} }
private boolean handle32BitPrimitiveSput(AnalyzedInstruction analyzedInstruction,
RegisterType.Category instructionCategory) {
SingleRegisterInstruction instruction = (SingleRegisterInstruction)analyzedInstruction.instruction;
RegisterType sourceRegisterType = analyzedInstruction.getPreInstructionRegisterType(instruction.getRegisterA());
assert sourceRegisterType != null;
if (sourceRegisterType.category == RegisterType.Category.Unknown) {
return false;
}
//per CodeVerify.c in dalvik:
//java generates synthetic functions that write byte values into boolean fields
if (sourceRegisterType.category == RegisterType.Category.Byte &&
instructionCategory == RegisterType.Category.Boolean) {
sourceRegisterType = RegisterType.getRegisterType(RegisterType.Category.Boolean, null);
}
RegisterType instructionRegisterType = RegisterType.getRegisterType(instructionCategory, null);
if (!sourceRegisterType.canBeAssignedTo(instructionRegisterType)) {
throw new ValidationException(String.format("Cannot use %s with source register type %s.",
analyzedInstruction.instruction.opcode.name, sourceRegisterType.toString()));
}
//TODO: check access
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()));
}
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) {