commit f6a3cb0a4ed1da58024a5cb20697e2baf2c7dab5
author Primiano Tucci <primiano@google.com> Mon Jul 02 15:38:50 2018 +0100
committer Primiano Tucci <primiano@google.com> Thu Jul 05 09:02:20 2018 +0000
tree 01078fff601f93d28dc5ecec4d8e4d5de663f00a
parent d91316e9576a7baa1eed77caadcecca3edbe2793

Fix minor build errors

Bug: 76169489
Change-Id: I2f59a3f27e7f4ed7820ff6aae48ba7c3a2e25ae4

src/protozero/proto_decoder.cc

diff --git a/src/protozero/proto_decoder.cc b/src/protozero/proto_decoder.cc
index eab565d..2e2754e 100644
--- a/src/protozero/proto_decoder.cc
+++ b/src/protozero/proto_decoder.cc
@@ -19,6 +19,7 @@
 #include <string.h>
 
 #include "perfetto/base/logging.h"
+#include "perfetto/protozero/proto_utils.h"
 
 namespace protozero {
 
@@ -111,7 +112,8 @@
       }
       pos = new_pos;
       field.length_limited.data = pos;
-      field.length_limited.length = field_intvalue;
+      PERFETTO_CHECK(field_intvalue < proto_utils::kMaxMessageLength);
+      field.length_limited.length = static_cast<size_t>(field_intvalue);
       pos += field_intvalue;
       break;
     }