fixed a summary and prioritize summaries on interfaces over summaries on superclasses

Author: StevenArzt

soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/taintWrappers/resolvers/SummaryResolver.java

@@ -170,25 +170,24 @@ private boolean getSummariesHierarchy(final String methodSig, final ClassSummari
 				 */
 				private boolean checkInterfaces(String methodSig, ClassSummaries summaries, SootClass clazz,
 						ByReferenceBoolean classSupported) {
-					boolean hasSummaries = false;
 					for (SootClass intf : clazz.getInterfaces()) {
 						// Directly check the interface
 						if (summaries.merge(flows.getMethodFlows(intf, methodSig)))
-							hasSummaries = true;
+							return true;
 
 						for (SootClass parent : getAllParentClasses(intf)) {
 							// Do we have support for the interface?
 							if (summaries.merge(flows.getMethodFlows(parent, methodSig)))
-								hasSummaries = true;
+								return true;
 
 							updateClassExclusive(classSupported, parent, methodSig);
 						}
 					}
 
 					// We inject the hierarchy from summaries before the data flow analysis, thus
-					// the
-					// soot hierarchy already contains the manual information provided in the xmls.
-					return hasSummaries;
+					// the soot hierarchy already contains the manual information provided in the
+					// xmls.
+					return false;
 				}
 
 			});

soot-infoflow-summaries/summariesManual/java.util.Collection.xml

@@ -22,8 +22,10 @@
 		<method id="boolean addAll(java.util.Collection)">
 			<flows>
 				<flow isAlias="false" typeChecking="false">
-					<from sourceSinkType="Parameter" ParameterIndex="0" />
-					<to sourceSinkType="Field"
+					<from sourceSinkType="Parameter" ParameterIndex="0"
+						AccessPath="[java.util.Collection: java.lang.Object[] innerArray]"
+						AccessPathTypes="[java.lang.Object[]]" />
+				  <to sourceSinkType="Field"
 						AccessPath="[java.util.Collection: java.lang.Object[] innerArray]"
 						AccessPathTypes="[java.lang.Object[]]" />
 				</flow>