1 files changed, 7 insertions, 1 deletions
diff --git a/test/rtp_file_reader.cc b/test/rtp_file_reader.cc
index be8dc2bc..fd3116eb 100644
--- a/test/rtp_file_reader.cc
+++ b/test/rtp_file_reader.cc
@@ -16,6 +16,7 @@
 #include <string>
 #include <vector>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
@@ -113,13 +114,17 @@ class RtpDumpReader : public RtpFileReaderImpl {
     // Use 'len' here because a 'plen' of 0 specifies rtcp.
     len -= kPacketHeaderSize;
     if (packet->length < len) {
-      return false;
+      FATAL() << "Packet is too large to fit: " << len << " bytes vs "
+              << packet->length
+              << " bytes allocated. Consider increasing the buffer "
+                 "size";
     }
     if (fread(rtp_data, 1, len, file_) != len) {
       return false;
     }
 
     packet->length = len;
+    packet->original_length = plen;
     packet->time_ms = offset;
     return true;
   }
@@ -290,6 +295,7 @@ class PcapReader : public RtpFileReaderImpl {
     if (NextPcap(packet->data, &length, &packet->time_ms) != kResultSuccess)
       return false;
     packet->length = static_cast<size_t>(length);
+    packet->original_length = packet->length;
     return true;
   }