Skip to content

Commit 8388da8

Browse files
committed
fixes #112
1 parent 9ba084b commit 8388da8

File tree

6 files changed

+21
-19
lines changed

6 files changed

+21
-19
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>de.fraunhofer.sit.flowdroid</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.7</version>
8+
<version>2.7.1</version>
99
<name>FlowDroid Parent Module</name>
1010
<packaging>pom</packaging>
1111

soot-infoflow-android/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>de.tud.sse</groupId>
66
<artifactId>soot-infoflow-android</artifactId>
77
<name>soot-infoflow-android</name>
8-
<version>2.7</version>
8+
<version>2.7.1</version>
99
<description>Android-specific components of FlowDroid</description>
1010
<properties>
1111
<maven.compiler.source>1.7</maven.compiler.source>
@@ -93,7 +93,7 @@
9393
<dependency>
9494
<groupId>de.tud.sse</groupId>
9595
<artifactId>soot-infoflow</artifactId>
96-
<version>2.7</version>
96+
<version>2.7.1</version>
9797
</dependency>
9898
<dependency>
9999
<groupId>heros</groupId>

soot-infoflow-cmd/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>de.tud.sse</groupId>
66
<artifactId>soot-infoflow-cmd</artifactId>
77
<name>FlowDroid Command Line Util</name>
8-
<version>2.7</version>
8+
<version>2.7.1</version>
99
<description>Command-line utility for running FlowDroid</description>
1010

1111
<properties>
@@ -105,12 +105,12 @@
105105
<dependency>
106106
<groupId>de.tud.sse</groupId>
107107
<artifactId>soot-infoflow-android</artifactId>
108-
<version>2.7</version>
108+
<version>2.7.1</version>
109109
</dependency>
110110
<dependency>
111111
<groupId>de.tud.sse</groupId>
112112
<artifactId>soot-infoflow-summaries</artifactId>
113-
<version>2.7</version>
113+
<version>2.7.1</version>
114114
</dependency>
115115
<dependency>
116116
<groupId>heros</groupId>

soot-infoflow-cmd/src/soot/jimple/infoflow/cmd/MainClass.java

+11-9
Original file line numberDiff line numberDiff line change
@@ -312,15 +312,17 @@ public boolean accept(File dir, String name) {
312312

313313
// Configure the analyzer for the current APK file
314314
config.getAnalysisFileConfig().setTargetAPKFile(apkFile.getCanonicalPath());
315-
if (apksToAnalyze.size() > 1 || (outputFile.exists() && outputFile.isDirectory())) {
316-
String outputFileName = apkFile.getName().replace(".apk", ".xml");
317-
File curOutputFile = new File(outputFile, outputFileName);
318-
config.getAnalysisFileConfig().setOutputFile(curOutputFile.getCanonicalPath());
319-
320-
// If we have already analyzed this APK and we have the results, there is no
321-
// need to do it again
322-
if (curOutputFile.exists())
323-
continue;
315+
if (outputFile != null) {
316+
if (apksToAnalyze.size() > 1 || (outputFile.exists() && outputFile.isDirectory())) {
317+
String outputFileName = apkFile.getName().replace(".apk", ".xml");
318+
File curOutputFile = new File(outputFile, outputFileName);
319+
config.getAnalysisFileConfig().setOutputFile(curOutputFile.getCanonicalPath());
320+
321+
// If we have already analyzed this APK and we have the results, there is no
322+
// need to do it again
323+
if (curOutputFile.exists())
324+
continue;
325+
}
324326
}
325327

326328
// Create the data flow analyzer

soot-infoflow-summaries/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>de.tud.sse</groupId>
66
<artifactId>soot-infoflow-summaries</artifactId>
77
<name>StubDroid</name>
8-
<version>2.7</version>
8+
<version>2.7.1</version>
99
<description>Data Flow Summaries for FlowDroid</description>
1010

1111
<properties>
@@ -137,7 +137,7 @@
137137
<dependency>
138138
<groupId>de.tud.sse</groupId>
139139
<artifactId>soot-infoflow</artifactId>
140-
<version>2.7</version>
140+
<version>2.7.1</version>
141141

142142
<exclusions>
143143
<exclusion>
@@ -153,7 +153,7 @@
153153
<dependency>
154154
<groupId>de.tud.sse</groupId>
155155
<artifactId>soot-infoflow</artifactId>
156-
<version>2.7</version>
156+
<version>2.7.1</version>
157157
<type>test-jar</type>
158158
<scope>test</scope>
159159

soot-infoflow/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>de.tud.sse</groupId>
66
<artifactId>soot-infoflow</artifactId>
77
<name>soot-infoflow</name>
8-
<version>2.7</version>
8+
<version>2.7.1</version>
99
<description>Soot extending data flow tracking components for Java</description>
1010
<packaging>jar</packaging>
1111

0 commit comments

Comments
 (0)