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

* commit '48d998cd': Properly check for Blob max length

am 48d998cd: am aca71139: am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max length
* commit '48d998cd': Properly check for Blob max length
8a2c33b6 · Chad Brubaker · Android Git Automerger · c761a1ed · 48d998cd · 8a2c33b6
Commit 8a2c33b6 authored 9 years ago by Chad Brubaker Committed by Android Git Automerger 9 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

keystore/keystore.cpp keystore/keystore.cpp +4 -4

No files found.
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -495,12 +495,12 @@ class Blob {
 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;