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

Improve the canNarrowAfterInstanceOf check when using an empty bootclasspath

Browse Source 
If the types in question can't be resolved, we just assume that the
narrowing can't happen.
This commit is contained in:
Ben Gruver 2016-09-18 14:25:38 -07:00
parent 12a3d71759
commit 41ba26d00a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1185,6 +1185,7 @@ public class MethodAnalyzer {
Reference reference = ((Instruction22c)analyzedInstanceOfInstruction.getInstruction()).getReference(); Reference reference = ((Instruction22c)analyzedInstanceOfInstruction.getInstruction()).getReference();
RegisterType registerType = RegisterType.getRegisterType(classPath, (TypeReference)reference); RegisterType registerType = RegisterType.getRegisterType(classPath, (TypeReference)reference);
try {
if (registerType.type != null && !registerType.type.isInterface()) { if (registerType.type != null && !registerType.type.isInterface()) {
int objectRegister = ((TwoRegisterInstruction)analyzedInstanceOfInstruction.getInstruction()) int objectRegister = ((TwoRegisterInstruction)analyzedInstanceOfInstruction.getInstruction())
.getRegisterB(); .getRegisterB();
@ -1193,6 +1194,9 @@ public class MethodAnalyzer {
return isNarrowingConversion(originalType, registerType); return isNarrowingConversion(originalType, registerType);
} }
} catch (UnresolvedClassException ex) {
return false;
}
} }
return false; return false;
} }