From 55b3ccd0210f3d0b033da468033057d6af5850f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Wed, 12 Aug 2020 13:15:02 +0200 Subject: [PATCH] Fix incorrect ToUnsigned in RTC event log. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I9038ac69c253975a4fc5e074aa13b2573efab9ef Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181462 Reviewed-by: Elad Alon Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/master@{#32537} --- logging/rtc_event_log/rtc_event_log_parser.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc index a49af871fc..dcecc507ad 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.cc +++ b/logging/rtc_event_log/rtc_event_log_parser.cc @@ -3003,13 +3003,11 @@ ParsedRtcEventLog::ParseStatus ParsedRtcEventLog::StoreGenericPacketSentEvent( RTC_PARSE_CHECK_OR_RETURN_EQ(overhead_length_values.size(), number_of_deltas); std::vector> payload_length_values = DecodeDeltas( - proto.payload_length_deltas(), ToUnsigned(proto.payload_length()), - number_of_deltas); // TODO(terelius): Remove ToUnsigned + proto.payload_length_deltas(), proto.payload_length(), number_of_deltas); RTC_PARSE_CHECK_OR_RETURN_EQ(payload_length_values.size(), number_of_deltas); std::vector> padding_length_values = DecodeDeltas( - proto.padding_length_deltas(), ToUnsigned(proto.padding_length()), - number_of_deltas); // TODO(terelius): Remove ToUnsigned + proto.padding_length_deltas(), proto.padding_length(), number_of_deltas); RTC_PARSE_CHECK_OR_RETURN_EQ(padding_length_values.size(), number_of_deltas); for (size_t i = 0; i < number_of_deltas; i++) { @@ -3073,10 +3071,10 @@ ParsedRtcEventLog::StoreGenericPacketReceivedEvent( int64_t packet_number; RTC_PARSE_CHECK_OR_RETURN( ToSigned(packet_number_values[i].value(), &packet_number)); - int32_t packet_length; - RTC_PARSE_CHECK_OR_RETURN( - ToSigned(packet_length_values[i].value(), - &packet_length)); // TODO(terelius): Remove ToSigned + RTC_PARSE_CHECK_OR_RETURN_LE(packet_length_values[i].value(), + std::numeric_limits::max()); + int32_t packet_length = + static_cast(packet_length_values[i].value()); generic_packets_received_.push_back( {timestamp_ms * 1000, packet_number, packet_length}); }