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

Unified Diff: webrtc/video/packet_injection_tests.cc

Issue 1238033003: Prevent OOB reads for truncated H264 STAP-A packets. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: added logging + todos Created 5 years, 5 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/test/call_test.cc ('k') | webrtc/webrtc_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/packet_injection_tests.cc
diff --git a/webrtc/video/packet_injection_tests.cc b/webrtc/video/packet_injection_tests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7e1d98f6b4004e1f7a7aa17ea945d0eeb4acdcad
--- /dev/null
+++ b/webrtc/video/packet_injection_tests.cc
@@ -0,0 +1,91 @@
+/*
+ * 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 "testing/gtest/include/gtest/gtest.h"
+
+#include "webrtc/test/call_test.h"
+#include "webrtc/test/null_transport.h"
+
+namespace webrtc {
+
+class PacketInjectionTest : public test::CallTest {
+ protected:
+ enum class CodecType {
+ kVp8,
+ kH264,
+ };
+
+ PacketInjectionTest() : rtp_header_parser_(RtpHeaderParser::Create()) {}
+
+ void InjectIncorrectPacket(CodecType codec_type,
+ uint8_t packet_type,
+ const uint8_t* packet,
+ size_t length);
+
+ rtc::scoped_ptr<RtpHeaderParser> rtp_header_parser_;
+};
+
+void PacketInjectionTest::InjectIncorrectPacket(CodecType codec_type,
+ uint8_t payload_type,
+ const uint8_t* packet,
+ size_t length) {
+ test::NullTransport transport;
+ CreateSenderCall(Call::Config(&transport));
+ CreateReceiverCall(Call::Config(&transport));
+
+ CreateSendConfig(1);
+ CreateMatchingReceiveConfigs();
+ receive_configs_[0].decoders[0].payload_type = payload_type;
+ switch (codec_type) {
+ case CodecType::kVp8:
+ receive_configs_[0].decoders[0].payload_name = "VP8";
+ break;
+ case CodecType::kH264:
+ receive_configs_[0].decoders[0].payload_name = "H264";
+ break;
+ }
+ CreateStreams();
+
+ RTPHeader header;
+ EXPECT_TRUE(rtp_header_parser_->Parse(packet, length, &header));
+ EXPECT_EQ(kSendSsrcs[0], header.ssrc)
+ << "Packet should have configured SSRC to not be dropped early.";
+ EXPECT_EQ(payload_type, header.payloadType);
+ Start();
+ EXPECT_EQ(PacketReceiver::DELIVERY_PACKET_ERROR,
+ receiver_call_->Receiver()->DeliverPacket(MediaType::VIDEO, packet,
+ length));
+ Stop();
+
+ DestroyStreams();
+}
+
+TEST_F(PacketInjectionTest, StapAPacketWithTruncatedNalUnits) {
+ const uint8_t kPacket[] = {0x80,
+ 0xE5,
+ 0xE6,
+ 0x0,
+ 0x0,
+ 0xED,
+ 0x23,
+ 0x4,
+ 0x00,
+ 0xC0,
+ 0xFF,
+ 0xED,
+ 0x58,
+ 0xCB,
+ 0xED,
+ 0xDF};
+
+ InjectIncorrectPacket(CodecType::kH264, 101, kPacket, sizeof(kPacket));
+}
+
+} // namespace webrtc
« no previous file with comments | « webrtc/test/call_test.cc ('k') | webrtc/webrtc_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698