commit 4083f3f010d56ee4e77179680e461a8ee281dc1e
author Nick Kralevich <nnk@google.com> Fri Mar 22 20:21:46 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Mar 22 20:21:46 2019 -0700
tree e40d2e3fc9db58b7f1e7b166713294dd275944ab
parent 999e6c3aac0722b9e257b09099ee0ee773227bb3
parent 3d9f9e2600007cc4fd53a1ddfe2c639b01e08fe6

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

Change-Id: I1cd6b19a88c425aa16019b406454e7aaad4a16af

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..