Merge pull request #769 from MarcMil/fix-manifest

Fix ARSC typescount bug and allow disabling of strict mode

Author: StevenArzt

soot-infoflow-android/src/soot/jimple/infoflow/android/resources/ARSCFileParser.java

@@ -1481,9 +1481,9 @@ protected static class ResTable_TypeSpec {
 		 */
 		int res0; // uint8
 		/**
-		 * Must be 1.
+		 * Specifies the number of ResTable_type entries
 		 */
-		int res1; // uint16
+		int typesCount; // uint16
 		/**
 		 * Number of uint32_t entry configuration masks that follow.
 		 */
@@ -1497,7 +1497,7 @@ public int hashCode() {
 			result = prime * result + ((header == null) ? 0 : header.hashCode());
 			result = prime * result + id;
 			result = prime * result + res0;
-			result = prime * result + res1;
+			result = prime * result + typesCount;
 			return result;
 		}
 
@@ -1521,7 +1521,7 @@ public boolean equals(Object obj) {
 				return false;
 			if (res0 != other.res0)
 				return false;
-			if (res1 != other.res1)
+			if (typesCount != other.typesCount)
 				return false;
 			return true;
 		}
@@ -2696,10 +2696,8 @@ private int readTypeSpecTable(ResTable_TypeSpec typeSpecTable, byte[] data, int
 		}
 		offset += 1;
 
-		typeSpecTable.res1 = readUInt16(data, offset);
-		if (typeSpecTable.res1 != 0) {
-			raiseFormatViolationIssue("File format violation in type spec table: res1 is not zero", offset);
-		}
+		//this was reserved before and is now used! 
+		typeSpecTable.typesCount = readUInt16(data, offset);
 		offset += 2;
 
 		typeSpecTable.entryCount = readUInt32(data, offset);

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

@@ -33,6 +33,7 @@
 import soot.jimple.infoflow.android.InfoflowAndroidConfiguration.CallbackAnalyzer;
 import soot.jimple.infoflow.android.SetupApplication;
 import soot.jimple.infoflow.android.config.XMLConfigurationParser;
+import soot.jimple.infoflow.android.resources.ARSCFileParser;
 import soot.jimple.infoflow.methodSummary.data.provider.LazySummaryProvider;
 import soot.jimple.infoflow.methodSummary.taintWrappers.ReportMissingSummaryWrapper;
 import soot.jimple.infoflow.methodSummary.taintWrappers.SummaryTaintWrapper;
@@ -103,6 +104,7 @@ public class MainClass {
 	private static final String OPTION_MAX_CALLBACKS_DEPTH = "md";
 	private static final String OPTION_PATH_SPECIFIC_RESULTS = "ps";
 	private static final String OPTION_MAX_THREAD_NUMBER = "mt";
+	private static final String OPTION_LENIENT_PARSING_MODE = "lp";
 
 	// Inter-component communication
 	private static final String OPTION_ICC_MODEL = "im";
@@ -249,6 +251,8 @@ private void initializeCommandLineOptions() {
 		options.addOption(OPTION_CALLGRAPH_FILE, "callgraphdir", true,
 				"The file in which to store and from which to read serialized callgraphs");
 		options.addOption(OPTION_CALLGRAPH_ONLY, "callgraphonly", false, "Only compute the callgraph and terminate");
+		options.addOption(OPTION_LENIENT_PARSING_MODE, "lenientparsing", false,
+				"Enables non-strict parsing, i.e. tries to continue rather than fail in case of a parsing error");
 	}
 
 	public static void main(String[] args) throws Exception {
@@ -883,6 +887,9 @@ private void parseCommandLineOptions(CommandLine cmd, InfoflowAndroidConfigurati
 			config.setExcludeSootLibraryClasses(false);
 			config.setIgnoreFlowsInSystemPackages(false);
 		}
+		if (cmd.hasOption(OPTION_LENIENT_PARSING_MODE)) {
+			ARSCFileParser.STRICT_MODE = false;
+		}
 
 		// Callgraph-specific options
 		if (cmd.hasOption(OPTION_CALLGRAPH_ONLY))