diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-08-12 23:09:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-12 23:09:42 +0000 |
| commit | 738d1e9d0ec29964f01211ceb6f471d6666b2316 (patch) | |
| tree | 32de711deb6aef48167eb0ad8c4fe8e32b8b8ba3 | |
| parent | fd1ad3790fb089485cf7afc07f8b9f53d4c3136a (diff) | |
| parent | 1b8885baf5ebe2e2e6fdfe6e53174fd79f46ae11 (diff) | |
| download | android_system_security-738d1e9d0ec29964f01211ceb6f471d6666b2316.tar.gz android_system_security-738d1e9d0ec29964f01211ceb6f471d6666b2316.tar.bz2 android_system_security-738d1e9d0ec29964f01211ceb6f471d6666b2316.zip | |
am 1b8885ba: am 0d593526: Properly check for Blob max length
* commit '1b8885baf5ebe2e2e6fdfe6e53174fd79f46ae11':
Properly check for Blob max length
| -rw-r--r-- | keystore/keystore.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 @@ 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; |