Skip to content

Commit 9ba084b

Browse files
committed
fixed a failing test case
1 parent 90b63b2 commit 9ba084b

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

soot-infoflow/src/soot/jimple/infoflow/data/Abstraction.java

+5
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ public boolean equals(Abstraction abs1, Abstraction abs2) {
121121
return false;
122122
} else if (!abs1.predecessor.equals(abs2.predecessor))
123123
return false;
124+
if (abs1.currentStmt == null) {
125+
if (abs2.currentStmt != null)
126+
return false;
127+
} else if (!abs1.currentStmt.equals(abs2.currentStmt))
128+
return false;
124129

125130
return abs1.localEquals(abs2);
126131
}

soot-infoflow/src/soot/jimple/infoflow/data/SourceContextAndPath.java

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public SourceContextAndPath extendPath(Abstraction abs, PathConfiguration pathCo
127127
if (scap.path == null)
128128
scap.path = new ExtensibleList<Abstraction>();
129129
scap.path.add(abs);
130+
130131
if (pathConfig != null && pathConfig.getMaxPathLength() > 0
131132
&& scap.path.size() > pathConfig.getMaxPathLength())
132133
return null;

soot-infoflow/src/soot/jimple/infoflow/problems/BackwardsInfoflowProblem.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ private Set<Abstraction> computeAliases(final DefinitionStmt defStmt, Value left
119119
assert !source.getAccessPath().isEmpty();
120120

121121
// A backward analysis looks for aliases of existing taints and
122-
// thus
123-
// cannot create new taints out of thin air
122+
// thus cannot create new taints out of thin air
124123
if (source == getZeroValue())
125124
return null;
126125

0 commit comments

Comments
 (0)