commit 0786b52c2ea0d168fcc18a0a90db1273c4cfc711
author Mirko Bonadei <mbonadei@webrtc.org> Mon Jul 19 10:09:58 2021
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jul 19 11:12:23 2021
tree c19b906402c598f46842598cf421c8dcc9cdbf17
parent f39c1708a208a9dc6a9afb9f7b15f7e1f9311312

Stop parsing if current message length is bigger than buffer.

If allow_incomplete_logs_ is false and the current message length is
bigger than the remaining buffer, this CL returns an error status
to the client.

Bug: None
Change-Id: Idcacda9f42429416da3272651621b8d5936fc69e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/225545
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Elad Alon <eladalon@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34500}

logging/rtc_event_log/rtc_event_log_parser.cc

diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc
index 08fb940..91df18b 100644
--- a/logging/rtc_event_log/rtc_event_log_parser.cc
+++ b/logging/rtc_event_log/rtc_event_log_parser.cc
@@ -1311,12 +1311,17 @@
     }
 
     if (message_length > s.size()) {
-      RTC_LOG(LS_WARNING) << "Protobuf message length is too large.";
+      RTC_LOG(LS_WARNING) << "Protobuf message length is larger than the "
+                             "remaining bytes in the proto.";
       RTC_PARSE_WARN_AND_RETURN_SUCCESS_IF(allow_incomplete_logs_,
                                            kIncompleteLogError);
-      RTC_PARSE_CHECK_OR_RETURN_LE(message_length, kMaxEventSize);
+      return ParseStatus::Error(
+          "Incomplete message: the length of the next message is larger than "
+          "the remaining bytes in the proto",
+          __FILE__, __LINE__);
     }
 
+    RTC_PARSE_CHECK_OR_RETURN_LE(message_length, kMaxEventSize);
     // Skip forward to the start of the next event.
     s = s.substr(message_length);
     size_t total_event_size = event_start.size() - s.size();