ReVanced/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-05-26 03:22:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential NPE in MethodAnalyzer

Browse Source
This commit is contained in:
Ben Gruver 2014-07-19 20:26:27 -07:00 committed by Connor Tumbleson
parent 1b0a917a6a
commit 5388ed57ba
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/analysis/MethodAnalyzer.java
View File

@ -1645,11 +1645,14 @@ public class MethodAnalyzer {
// methodClass is now the first accessible class found. Now. we need to make sure that the method is // methodClass is now the first accessible class found. Now. we need to make sure that the method is
// actually valid for this class // actually valid for this class
resolvedMethod = classPath.getClass(methodClass.getType()).getMethodByVtableIndex(methodIndex); MethodReference newResolvedMethod =
if (resolvedMethod == null) { classPath.getClass(methodClass.getType()).getMethodByVtableIndex(methodIndex);
if (newResolvedMethod == null) {
// TODO: fix NPE here
throw new ExceptionWithContext("Couldn't find accessible class while resolving method %s", throw new ExceptionWithContext("Couldn't find accessible class while resolving method %s",
ReferenceUtil.getMethodDescriptor(resolvedMethod, true)); ReferenceUtil.getMethodDescriptor(resolvedMethod, true));
} }
resolvedMethod = newResolvedMethod;
resolvedMethod = new ImmutableMethodReference(methodClass.getType(), resolvedMethod.getName(), resolvedMethod = new ImmutableMethodReference(methodClass.getType(), resolvedMethod.getName(),
resolvedMethod.getParameterTypes(), resolvedMethod.getReturnType()); resolvedMethod.getParameterTypes(), resolvedMethod.getReturnType());
} }