Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Unified Diff: webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc

Issue 2074763002: Revert of Fix crash parsing malformed rtp packet (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_packet.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
index 28c124a94db2400c851e6b597885e0a247cafcfd..b992d2da909345272eb4de4c84bab955d7ce1a4b 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc
@@ -31,7 +31,6 @@
constexpr bool kVoiceActive = true;
constexpr uint8_t kAudioLevel = 0x5a;
constexpr size_t kMaxPaddingSize = 224u;
-// clang-format off
constexpr uint8_t kMinimumPacket[] = {
0x80, kPayloadType, 0x00, kSeqNum,
0x65, 0x43, 0x12, 0x78,
@@ -64,7 +63,7 @@
0x12, 0x00, 0x56, 0xce,
'p', 'a', 'y', 'l', 'o', 'a', 'd',
'p', 'a', 'd', 'd', 'i', 'n', 'g', kPacketPaddingSize};
-// clang-format on
+
} // namespace
TEST(RtpPacketTest, CreateMinimum) {
@@ -194,36 +193,6 @@
EXPECT_EQ(0u, packet.padding_size());
}
-TEST(RtpPacketTest, ParseWithInvalidSizedExtension) {
- // clang-format off
- constexpr uint8_t kBadPacket[] = {
- 0x90, kPayloadType, 0x00, kSeqNum,
- 0x65, 0x43, 0x12, 0x78, // kTimestamp.
- 0x12, 0x34, 0x56, 0x78, // kSSrc.
- 0xbe, 0xde, 0x00, 0x02, // Extension block of size 2 x 32bit words.
- (kTransmissionOffsetExtensionId << 4) | 6, // (6+1)-byte extension, but
- 'e', 'x', 't', // Transmission Offset
- 'd', 'a', 't', 'a', // expected to be 3-bytes.
- 'p', 'a', 'y', 'l', 'o', 'a', 'd',
- };
- // clang-format on
-
- RtpPacketToSend::ExtensionManager extensions;
- extensions.Register(kRtpExtensionTransmissionTimeOffset,
- kTransmissionOffsetExtensionId);
-
- RtpPacketReceived packet(&extensions);
- EXPECT_TRUE(packet.Parse(kBadPacket, sizeof(kBadPacket)));
-
- // Extension should be ignored.
- int32_t time_offset;
- EXPECT_FALSE(packet.GetExtension<TransmissionOffset>(&time_offset));
-
- // But shouldn't prevent reading payload.
- EXPECT_THAT(make_tuple(packet.payload(), packet.payload_size()),
- ElementsAreArray(kPayload));
-}
-
TEST(RtpPacketTest, ParseWith2Extensions) {
RtpPacketToSend::ExtensionManager extensions;
extensions.Register(kRtpExtensionTransmissionTimeOffset,
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_packet.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698