[wala] 07/09: Add a patch to fix null pointer errors

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository wala.

commit ba636c5a24063e3b96bb25656ea73e7c9bcdac96
Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
Date:   Thu Feb 16 16:40:07 2017 +0800

    Add a patch to fix null pointer errors
---
 debian/patches/AndroidAnalysisScope_NullPointer.patch | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/AndroidAnalysisScope_NullPointer.patch b/debian/patches/AndroidAnalysisScope_NullPointer.patch
new file mode 100644
index 0000000..ca0c4a0
--- /dev/null
+++ b/debian/patches/AndroidAnalysisScope_NullPointer.patch
@@ -0,0 +1,19 @@
+--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidAnalysisScope.java
++++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidAnalysisScope.java
+@@ -34,13 +34,15 @@
+ 	public static AnalysisScope setUpAndroidAnalysisScope(URI classpath, String exclusions, ClassLoader loader, URI... androidLib) throws IOException {
+ 		AnalysisScope scope;
+ 		if (androidLib == null || androidLib.length == 0) {
+-			scope = AnalysisScopeReader.readJavaScope(BASIC_FILE, new File(exclusions), loader);
++			scope = AnalysisScopeReader.readJavaScope(BASIC_FILE, (exclusions == null) ? null : new File(exclusions), loader);
+ 		} else {
+ 			scope = AnalysisScope.createJavaAnalysisScope();
+ 
++      if (exclusions != null) {
+ 			File exclusionsFile = new File(exclusions);
+ 	        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");
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bbf7a95
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+AndroidAnalysisScope_NullPointer.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wala.git