diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-20 01:04:58 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-20 01:04:58 +0000 |
commit | a02766bd76595d6f50c331a29a42b28d7097b424 (patch) | |
tree | 16a3fc37ea924893d22684c3e834c4522cdc624b | |
parent | fd977942a7280bc8cd764b571ec6dc073ee23c24 (diff) | |
parent | 6ff499cf9f327c9503ab028c1ffb60fdd4f7b61a (diff) | |
download | puffin-a02766bd76595d6f50c331a29a42b28d7097b424.tar.gz |
Snap for 8474198 from 6ff499cf9f327c9503ab028c1ffb60fdd4f7b61a to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-release
Change-Id: I95722f2d1c8215ce21688fbb663ee5fcbf01ba66
-rw-r--r-- | src/utils.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/utils.cc b/src/utils.cc index b2666d3..23d8479 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -185,7 +185,7 @@ bool IsValidGzipHeader(const uint8_t* header, size_t size) { // 0 1 0x1F // 1 1 0x8B // 2 1 compression method (8 denotes deflate) - static const uint8_t magic[] = {0x1F, 0x8B, 8}; + static constexpr uint8_t magic[] = {0x1F, 0x8B, 8}; return size >= 10 && std::equal(std::begin(magic), std::end(magic), header); } } // namespace @@ -240,10 +240,10 @@ bool LocateDeflatesInGzip(const Buffer& data, vector<BitExtent>* deflates) { offset += compressed_size; // Ignore CRC32 and uncompressed size. - TEST_AND_RETURN_FALSE(offset + 8 <= data.size()); offset += 8; member_start = offset; - } while (IsValidGzipHeader(&data[member_start], data.size() - member_start)); + } while (member_start < data.size() && + IsValidGzipHeader(&data[member_start], data.size() - member_start)); return true; } |