commit a02766bd76595d6f50c331a29a42b28d7097b424
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 20 01:04:58 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 20 01:04:58 2022 +0000
tree 16a3fc37ea924893d22684c3e834c4522cdc624b
parent fd977942a7280bc8cd764b571ec6dc073ee23c24
parent 6ff499cf9f327c9503ab028c1ffb60fdd4f7b61a

Snap for 8474198 from 6ff499cf9f327c9503ab028c1ffb60fdd4f7b61a to tm-release

Change-Id: I95722f2d1c8215ce21688fbb663ee5fcbf01ba66

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