commit 7de62256213b6a5d6e4bf19a2d839d377ff7b63c
author Nick Kralevich <nnk@google.com> Fri Mar 22 20:25:57 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Mar 22 20:25:57 2019 -0700
tree fe4508587e73e61bb41387749f857277b9926833
parent 8bf394cbb97950e78f16b0d14e00a6ba2222f8ab
parent 4083f3f010d56ee4e77179680e461a8ee281dc1e

Merge "entry_name_utils-inl.h: clear top bit before shifting" am: a72477630d am: a5ff3e1276
am: 15d1c2ec65

Change-Id: I34998ad0a29161043574570a0e0c7a9ee8bebad3

libziparchive/entry_name_utils-inl.h

diff --git a/libziparchive/entry_name_utils-inl.h b/libziparchive/entry_name_utils-inl.h
index 5fc2fb4..1714586 100644
--- a/libziparchive/entry_name_utils-inl.h
+++ b/libziparchive/entry_name_utils-inl.h
@@ -35,7 +35,7 @@
       return false;
     } else {
       // 2-5 byte sequences.
-      for (uint8_t first = byte << 1; first & 0x80; first <<= 1) {
+      for (uint8_t first = (byte & 0x7f) << 1; first & 0x80; first = (first & 0x7f) << 1) {
         ++i;
 
         // Missing continuation byte..