DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes Exception in AndroidAnalysisScope (#361) 

Fixes inconsistent behavior of the exclusions argument.
Depending on the androidLib argument, setting exclusions to null
is either fine or raises and exception.

This patch makes exclusions truely optional for any case
when null is passed.
This commit is contained in:
Erik Derr 2018-10-03 07:29:44 +02:00 committed by Manu Sridharan
parent ee13713c4d
commit 018e9d20eb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidAnalysisScope.java
View File

@ -33,16 +33,19 @@ public class AndroidAnalysisScope {
public static AnalysisScope setUpAndroidAnalysisScope(URI classpath, String exclusions, ClassLoader loader, URI... androidLib) throws IOException {
AnalysisScope scope;
File exclusionsFile = exclusions != null? new File(exclusions) : null;
if (androidLib == null || androidLib.length == 0) {
scope = AnalysisScopeReader.readJavaScope(BASIC_FILE, new File(exclusions), loader);
scope = AnalysisScopeReader.readJavaScope(BASIC_FILE, exclusionsFile, loader);
} else {
scope = AnalysisScope.createJavaAnalysisScope();
File exclusionsFile = new File(exclusions);
try (final InputStream fs = exclusionsFile.exists()? new FileInputStream(exclusionsFile): FileProvider.class.getClassLoader().getResourceAsStream(exclusionsFile.getName())) {
scope.setExclusions(new FileOfClasses(fs));
}
if (exclusionsFile != null) {
try (final InputStream fs = exclusionsFile.exists() ? new FileInputStream(exclusionsFile) : FileProvider.class.getClassLoader().getResourceAsStream(exclusionsFile.getName())) {
scope.setExclusions(new FileOfClasses(fs));
}
}
scope.setLoaderImpl(ClassLoaderReference.Primordial,
"com.ibm.wala.dalvik.classLoader.WDexClassLoaderImpl");