commit f852fb2921128d3b71a76e6b17c78d10fb7085e2
author Brian Carlstrom <bdc@google.com> Fri Oct 19 11:01:58 2012 -0700
committer Brian Carlstrom <bdc@google.com> Fri Oct 19 11:20:55 2012 -0700
tree aa92629bcd238d45fd1dc5d6d20f894999254e07
parent ec139de9e77663c13a907a5244267db8bed947b5

Fix OatHeader.isValid

Change-Id: I4371b9e7082a5131622680fea472da9d7e24f750

src/oat.cc

diff --git a/src/oat.cc b/src/oat.cc
index 6284f9a..a328a11 100644
--- a/src/oat.cc
+++ b/src/oat.cc
@@ -37,6 +37,7 @@
 
   adler32_checksum_ = adler32(0L, Z_NULL, 0);
 
+  CHECK_NE(instruction_set, kNone);
   instruction_set_ = instruction_set;
   UpdateChecksum(&instruction_set_, sizeof(instruction_set_));
 
@@ -58,10 +59,10 @@
 }
 
 bool OatHeader::IsValid() const {
-  if (memcmp(magic_, kOatMagic, sizeof(kOatMagic) != 0)) {
+  if (memcmp(magic_, kOatMagic, sizeof(kOatMagic)) != 0) {
     return false;
   }
-  if (memcmp(version_, kOatVersion, sizeof(kOatVersion) != 0)) {
+  if (memcmp(version_, kOatVersion, sizeof(kOatVersion)) != 0) {
     return false;
   }
   return true;