commit 0fc9500b198d6e1fd6dcecf2fa51185b94fdc8ab
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 20 03:05:03 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 20 03:05:03 2022 +0000
tree 16a3fc37ea924893d22684c3e834c4522cdc624b
parent fe88f72eceaf50211543a574fc3a58e0cd7e8461
parent aba7b5df5864e0f9f56acc9cc1f62f6d15dbffce

Snap for 8474975 from aba7b5df5864e0f9f56acc9cc1f62f6d15dbffce to tm-qpr1-release

Change-Id: I8aa8fb55a65c075a030afec8a31e07d22bea1eb9

src/utils.cc

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 @@
   // 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 @@
     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;
 }