commit f48a705f257d9352bb38ddc5db737aa45fb69ca4
author Vladimir Marko <vmarko@google.com> Tue Apr 21 09:45:57 2020 +0100
committer Vladimir Marko <vmarko@google.com> Tue Apr 21 12:06:50 2020 +0100
tree fddd6a23682e814115bc1e103deaa9c3b11787f2
parent 63ba6477e76278d949f382e9babb146b13732878

Minor error reporting clean up in DexFileVerifier.

Test: m
Change-Id: If768098425d626ecac664531f1a532cf0d40e6d6

libdexfile/dex/dex_file_verifier.cc

diff --git a/libdexfile/dex/dex_file_verifier.cc b/libdexfile/dex/dex_file_verifier.cc
index a3fae69..b7444c5 100644
--- a/libdexfile/dex/dex_file_verifier.cc
+++ b/libdexfile/dex/dex_file_verifier.cc
@@ -448,15 +448,11 @@
   // All sources of the `idx` have already been checked in CheckIntraSection().
   DCHECK_LT(idx.index_, header_->type_ids_size_);
 
-  auto err_fn = [&](const char* descriptor) {
-    ErrorStringPrintf("%s: '%s'", error_msg, descriptor);
-  };
-
   char cached_char = verified_type_descriptors_[idx.index_];
   if (cached_char != 0) {
     if (!extra_check(cached_char)) {
       const char* descriptor = dex_file_->StringByTypeIdx(idx);
-      err_fn(descriptor);
+      ErrorStringPrintf("%s: '%s'", error_msg, descriptor);
       return false;
     }
     return true;
@@ -464,13 +460,13 @@
 
   const char* descriptor = dex_file_->StringByTypeIdx(idx);
   if (UNLIKELY(!IsValidDescriptor(descriptor))) {
-    err_fn(descriptor);
+    ErrorStringPrintf("%s: '%s'", error_msg, descriptor);
     return false;
   }
   verified_type_descriptors_[idx.index_] = descriptor[0];
 
   if (!extra_check(descriptor[0])) {
-    err_fn(descriptor);
+    ErrorStringPrintf("%s: '%s'", error_msg, descriptor);
     return false;
   }
   return true;