Snap for 8512216 from 6ff499cf9f327c9503ab028c1ffb60fdd4f7b61a to tm-frc-cellbroadcast-releaset_frc_cbr_330443000android13-frc-cellbroadcast-release

Change-Id: I6b515a9ad0b3479d84cb9ca3c9977d70afa6b947

2 files changed, 8 insertions, 3 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index ee8f0ca..d78c7bd 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,5 +3,10 @@
     {
       "name": "puffin_unittest"
     }
+  ],
+  "hwasan-postsubmit": [
+    {
+      "name": "puffin_unittest"
+    }
   ]
 }
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;
 }