commit aca711395dd65d05b48c8bec3b1d2da8d81d41b8
author Chad Brubaker <cbrubaker@google.com> Wed Aug 12 23:29:45 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 12 23:29:45 2015 +0000
tree cb07329d4656242cdacef40862128275d9dfb7b4
parent 853b8d7984673976f943fc1664012598cb040696
parent 738d1e9d0ec29964f01211ceb6f471d6666b2316

am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max length

* commit '738d1e9d0ec29964f01211ceb6f471d6666b2316':
  Properly check for Blob max length

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 58d2fd6..4fdd593 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -487,12 +487,12 @@
 public:
     Blob(const uint8_t* value, size_t valueLength, const uint8_t* info, uint8_t infoLength,
             BlobType type) {
-        if (valueLength > sizeof(mBlob.value)) {
-            valueLength = sizeof(mBlob.value);
+        if (valueLength > VALUE_SIZE) {
+            valueLength = VALUE_SIZE;
             ALOGW("Provided blob length too large");
         }
-        if (infoLength + valueLength > sizeof(mBlob.value)) {
-            infoLength = sizeof(mBlob.value) - valueLength;
+        if (infoLength + valueLength > VALUE_SIZE) {
+            infoLength = VALUE_SIZE - valueLength;
             ALOGW("Provided info length too large");
         }
         mBlob.length = valueLength;