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

Check for switch offset validity in the MethodAnalyzer

Browse Source
This commit is contained in:
Ben Gruver 2016-02-14 19:08:19 -08:00
parent 6429b3daa9
commit 5b2943d89b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dexlib2/src/main/java/org/jf/dexlib2/analysis/MethodAnalyzer.java
View File

@ -499,11 +499,19 @@ public class MethodAnalyzer {
OffsetInstruction offsetInstruction = (OffsetInstruction)instruction.instruction; OffsetInstruction offsetInstruction = (OffsetInstruction)instruction.instruction;
if (instructionOpcode == Opcode.PACKED_SWITCH || instructionOpcode == Opcode.SPARSE_SWITCH) { if (instructionOpcode == Opcode.PACKED_SWITCH || instructionOpcode == Opcode.SPARSE_SWITCH) {
SwitchPayload switchPayload = (SwitchPayload)analyzedInstructions.get(instructionCodeAddress + AnalyzedInstruction analyzedSwitchPayload = analyzedInstructions.get(
offsetInstruction.getCodeOffset()).instruction; instructionCodeAddress + offsetInstruction.getCodeOffset());
if (analyzedSwitchPayload == null) {
throw new AnalysisException("Invalid switch payload offset");
}
SwitchPayload switchPayload = (SwitchPayload)analyzedSwitchPayload.instruction;
for (SwitchElement switchElement: switchPayload.getSwitchElements()) { for (SwitchElement switchElement: switchPayload.getSwitchElements()) {
AnalyzedInstruction targetInstruction = analyzedInstructions.get(instructionCodeAddress + AnalyzedInstruction targetInstruction = analyzedInstructions.get(instructionCodeAddress +
switchElement.getOffset()); switchElement.getOffset());
if (targetInstruction == null) {
throw new AnalysisException("Invalid switch target offset");
}
addPredecessorSuccessor(instruction, targetInstruction, exceptionHandlers, addPredecessorSuccessor(instruction, targetInstruction, exceptionHandlers,
instructionsToProcess); instructionsToProcess);