Add sanity check for arrival timestamps.

webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h"
 
+#include <limits>
+
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 
 namespace webrtc {
 
 // TODO(sprang): Tune these!
 const int RemoteEstimatorProxy::kDefaultProcessIntervalMs = 50;
 const int RemoteEstimatorProxy::kBackWindowMs = 500;
 
+// The maximum allowed value for a timestamp in milliseconds. This is lower
+// than the numerical limit since we often covert to microseconds.

[stefan-webrtc, 2016/07/29 09:20:01]

convert

[sprang_webrtc, 2016/07/29 09:27:37]

Done.

+static constexpr int64_t kMaxTimeMs =
+    std::numeric_limits<int64_t>::max() / 1000;
+
 RemoteEstimatorProxy::RemoteEstimatorProxy(Clock* clock,
                                            PacketRouter* packet_router)
     : clock_(clock),
       packet_router_(packet_router),
       last_process_time_ms_(-1),
       media_ssrc_(0),
       feedback_sequence_(0),
       window_start_seq_(-1) {}
 
 RemoteEstimatorProxy::~RemoteEstimatorProxy() {}
@@ skipping 46 matching lines @@
       RTC_DCHECK(packet_router_ != nullptr);
       packet_router_->SendFeedback(&feedback_packet);
     } else {
       more_to_build = false;
     }
   }
 }
 
 void RemoteEstimatorProxy::OnPacketArrival(uint16_t sequence_number,
                                            int64_t arrival_time) {
+  if (arrival_time < 0 || arrival_time > kMaxTimeMs) {
+    LOG(LS_WARNING) << "Arrival time out of bounds: " << arrival_time;
+    return;
+  }
+
   // TODO(holmer): We should handle a backwards wrap here if the first
   // sequence number was small and the new sequence number is large. The
   // SequenceNumberUnwrapper doesn't do this, so we should replace this with
   // calls to IsNewerSequenceNumber instead.
   int64_t seq = unwrapper_.Unwrap(sequence_number);
   if (seq > window_start_seq_ + 0xFFFF / 2) {
     LOG(LS_WARNING) << "Skipping this sequence number (" << sequence_number
                     << ") since it likely is reordered, but the unwrapper"
                        "failed to handle it. Feedback window starts at "
                     << window_start_seq_ << ".";
@@ skipping 62 matching lines @@
     // Note: Don't erase items from packet_arrival_times_ after sending, in case
     // they need to be re-sent after a reordering. Removal will be handled
     // by OnPacketArrival once packets are too old.
     window_start_seq_ = it->first + 1;
   }
 
   return true;
 }
 
 }  // namespace webrtc