commit d1abab7110101d65774f9d090850d20aaa07b661
author Andreas Gampe <agampe@google.com> Wed Jul 31 16:14:00 2019 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 01 17:01:19 2019 +0000
tree 6e171d36e7c497c17efc26ab0f9c7be4f888094b
parent 0134a28ec42f5c96a3dffcf496bf1af05d0942dc

ART: Check dex file constraint A1

Test: TODO
Change-Id: I77d6c7e4d6cf47fdc0268326b30808b56b59b813

libdexfile/dex/dex_file_verifier.cc

diff --git a/libdexfile/dex/dex_file_verifier.cc b/libdexfile/dex/dex_file_verifier.cc
index f69b657..80ab80f 100644
--- a/libdexfile/dex/dex_file_verifier.cc
+++ b/libdexfile/dex/dex_file_verifier.cc
@@ -1610,6 +1610,10 @@
 
   const uint16_t* insns = accessor.Insns();
   uint32_t insns_size = accessor.InsnsSizeInCodeUnits();
+  if (insns_size == 0) {
+    ErrorStringPrintf("insns_size must not be zero (%ud)", insns_size);
+    return false;
+  }
   if (!CheckListSize(insns, insns_size, sizeof(uint16_t), "insns size")) {
     return false;
   }