diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-01 00:15:38 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-01 00:15:38 +0000 |
| commit | 5883d6c955f7172fed2100b4b98833e18984d60b (patch) | |
| tree | b9b027af6f181031574ee05829b5fba078b01f2b | |
| parent | c353e8424c67c19df81f8cdff1d9c431db66a504 (diff) | |
| parent | 3edbac816828a0beb129ba18a3eee3c4625d7fc1 (diff) | |
| download | libcppbor-android-mainline-12.0.0_r98.tar.gz | |
Snap for 7692221 from 3edbac816828a0beb129ba18a3eee3c4625d7fc1 to mainline-art-releaseandroid-mainline-12.0.0_r98android-mainline-12.0.0_r69android-mainline-12.0.0_r5android-mainline-12.0.0_r42android-mainline-12.0.0_r22android-mainline-12.0.0_r115android12-mainline-art-release
Change-Id: I1c976d38ac03228136bf81062b4dd8ef5e57eb4f
| -rw-r--r-- | src/cppbor_parse.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cppbor_parse.cpp b/src/cppbor_parse.cpp index f5e8fcf..964a72d 100644 --- a/src/cppbor_parse.cpp +++ b/src/cppbor_parse.cpp @@ -96,7 +96,8 @@ std::tuple<const uint8_t*, ParseClient*> handleString(uint64_t length, const uin const uint8_t* valueBegin, const uint8_t* end, const std::string& errLabel, ParseClient* parseClient) { - if (end - valueBegin < static_cast<ssize_t>(length)) { + ssize_t signed_length = static_cast<ssize_t>(length); + if (end - valueBegin < signed_length || signed_length < 0) { parseClient->error(hdrBegin, insufficientLengthString(length, end - valueBegin, errLabel)); return {hdrBegin, nullptr /* end parsing */}; } |