diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-20 01:04:22 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-20 01:04:22 +0000 |
commit | e8aaaa757c806de6c4f0056c44002bbe54d3aafb (patch) | |
tree | 16a3fc37ea924893d22684c3e834c4522cdc624b | |
parent | 937f4256e73b5ce636ba93268e3de58e23080421 (diff) | |
parent | 8094db0efd9a711ea9fa55e98c55859e88b33d7e (diff) | |
download | puffin-android13-d1-s3-release.tar.gz |
Snap for 8474529 from 8094db0efd9a711ea9fa55e98c55859e88b33d7e to tm-d1-releaseandroid-13.0.0_r9android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10android13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-release
Change-Id: If261347d55d772cfc4e129cb618f1cb7545ff8d9
-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; } |