commit b05d9d92a00eb13527779d8f4fb3324ee1a2a2ee
author Alexander Timin <altimin@google.com> Mon Feb 08 22:57:25 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 08 22:57:25 2021 +0000
tree 6da3f0a59ae8a19f967374385e6cc64c574f957f
parent e34fab41d69c8c1d35d1fe4bc69e78ff08713f82
parent 1090e218941f4c30aea949a572283a8637bbe8da

Merge "Fix TracedValue compilation on Windows."

src/tracing/core/packet_stream_validator.cc

diff --git a/src/tracing/core/packet_stream_validator.cc b/src/tracing/core/packet_stream_validator.cc
index 3d2d846..72a20f5 100644
--- a/src/tracing/core/packet_stream_validator.cc
+++ b/src/tracing/core/packet_stream_validator.cc
@@ -72,8 +72,11 @@
     varint_ |= static_cast<uint64_t>(octet & 0x7F) << varint_shift_;
     if (octet & 0x80) {
       varint_shift_ += 7;
-      if (varint_shift_ >= 64)
+      if (varint_shift_ >= 64) {
+        // Do not invoke UB on next call.
+        varint_shift_ = 0;
         state_ = kInvalidVarInt;
+      }
       return 0;
     }
     uint64_t varint = varint_;