commit a0609e018a0c803963b9ba2f383149578a549016
author Anton Hansson <hansson@google.com> Wed Sep 19 00:00:49 2018 +0100
committer Anton Hansson <hansson@google.com> Wed Sep 19 13:58:43 2018 +0100
tree 932f084359157b5e02b3a5a4c880224b11de6b4d
parent f035463650ada4a2bc07a38ca23dd96758e3db92

Provide an error message for missing dex-file arg.

Without this, veridex segfaults if the user fat-fingers the
--dex-file argument (for example by omitting the equals sign).

Test: appcompat.sh (with and without --dex-file=)
Change-Id: Ie4637c667a16864774a0bdd92a772b1b96c5ea99

tools/veridex/veridex.cc

diff --git a/tools/veridex/veridex.cc b/tools/veridex/veridex.cc
index cf1167f..3572911 100644
--- a/tools/veridex/veridex.cc
+++ b/tools/veridex/veridex.cc
@@ -65,6 +65,16 @@
 VeriMethod VeriClass::loadClass_ = nullptr;
 VeriField VeriClass::sdkInt_ = nullptr;
 
+static const char* kDexFileOption = "--dex-file=";
+static const char* kStubsOption = "--core-stubs=";
+static const char* kWhitelistOption = "--whitelist=";
+static const char* kBlacklistOption = "--blacklist=";
+static const char* kDarkGreylistOption = "--dark-greylist=";
+static const char* kLightGreylistOption = "--light-greylist=";
+static const char* kImprecise = "--imprecise";
+static const char* kTargetSdkVersion = "--target-sdk-version=";
+static const char* kOnlyReportSdkUses = "--only-report-sdk-uses";
+
 struct VeridexOptions {
   const char* dex_file = nullptr;
   const char* core_stubs = nullptr;
@@ -90,16 +100,6 @@
   argv++;
   argc--;
 
-  static const char* kDexFileOption = "--dex-file=";
-  static const char* kStubsOption = "--core-stubs=";
-  static const char* kWhitelistOption = "--whitelist=";
-  static const char* kBlacklistOption = "--blacklist=";
-  static const char* kDarkGreylistOption = "--dark-greylist=";
-  static const char* kLightGreylistOption = "--light-greylist=";
-  static const char* kImprecise = "--imprecise";
-  static const char* kTargetSdkVersion = "--target-sdk-version=";
-  static const char* kOnlyReportSdkUses = "--only-report-sdk-uses";
-
   for (int i = 0; i < argc; ++i) {
     if (StartsWith(argv[i], kDexFileOption)) {
       options->dex_file = Substr(argv[i], strlen(kDexFileOption));
@@ -138,6 +138,12 @@
   static int Run(int argc, char** argv) {
     VeridexOptions options;
     ParseArgs(&options, argc, argv);
+
+    if (!options.dex_file) {
+      LOG(ERROR) << "Required argument '" << kDexFileOption << "' not provided.";
+      return 1;
+    }
+
     gTargetSdkVersion = options.target_sdk_version;
 
     std::vector<std::string> boot_content;
@@ -335,4 +341,3 @@
 int main(int argc, char** argv) {
   return art::Veridex::Run(argc, argv);
 }
-