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

Unified Diff: content/browser/renderer_host/p2p/socket_host_unittest.cc

Issue 589183002: Fix boundary check problems in socket_host.cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
Index: content/browser/renderer_host/p2p/socket_host_unittest.cc
diff --git a/content/browser/renderer_host/p2p/socket_host_unittest.cc b/content/browser/renderer_host/p2p/socket_host_unittest.cc
index fc96e4a158a7af3c43e665a3bd7f11c138dcd6e1..f35e35994dd519693038ae6ff4d41b8777a08d24 100644
--- a/content/browser/renderer_host/p2p/socket_host_unittest.cc
+++ b/content/browser/renderer_host/p2p/socket_host_unittest.cc
@@ -152,126 +152,126 @@ namespace content {
// This test verifies parsing of all invalid raw packets.
TEST(P2PSocketHostTest, TestInvalidRawRtpMessages) {
- int start_pos = INT_MAX, rtp_length = INT_MAX;
+ size_t start_pos = SIZE_MAX, rtp_length = SIZE_MAX;
EXPECT_FALSE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kRtpMsgWithInvalidLength),
sizeof(kRtpMsgWithInvalidLength),
&start_pos, &rtp_length));
- EXPECT_EQ(INT_MAX, start_pos);
- EXPECT_EQ(INT_MAX, rtp_length);
+ EXPECT_EQ(SIZE_MAX, start_pos);
+ EXPECT_EQ(SIZE_MAX, rtp_length);
EXPECT_FALSE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kRtpMsgWithInvalidExtnLength),
sizeof(kRtpMsgWithInvalidExtnLength),
&start_pos, &rtp_length));
- EXPECT_EQ(INT_MAX, start_pos);
- EXPECT_EQ(INT_MAX, rtp_length);
+ EXPECT_EQ(SIZE_MAX, start_pos);
+ EXPECT_EQ(SIZE_MAX, rtp_length);
}
// Verify invalid TURN send indication messages. Messages are proper STUN
// messages with incorrect values in attributes.
TEST(P2PSocketHostTest, TestInvalidTurnSendIndicationMessages) {
// Initializing out params to very large value.
- int start_pos = INT_MAX, rtp_length = INT_MAX;
+ size_t start_pos = SIZE_MAX, rtp_length = SIZE_MAX;
EXPECT_FALSE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kTurnSendIndicationMsgWithNoAttributes),
sizeof(kTurnSendIndicationMsgWithNoAttributes),
&start_pos, &rtp_length));
- EXPECT_EQ(INT_MAX, start_pos);
- EXPECT_EQ(INT_MAX, rtp_length);
+ EXPECT_EQ(SIZE_MAX, start_pos);
+ EXPECT_EQ(SIZE_MAX, rtp_length);
EXPECT_FALSE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kTurnSendIndicationMsgWithInvalidLength),
sizeof(kTurnSendIndicationMsgWithInvalidLength),
&start_pos, &rtp_length));
- EXPECT_EQ(INT_MAX, start_pos);
- EXPECT_EQ(INT_MAX, rtp_length);
+ EXPECT_EQ(SIZE_MAX, start_pos);
+ EXPECT_EQ(SIZE_MAX, rtp_length);
EXPECT_FALSE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kTurnSendIndicatinMsgWithNoDataAttribute),
sizeof(kTurnSendIndicatinMsgWithNoDataAttribute),
&start_pos, &rtp_length));
- EXPECT_EQ(INT_MAX, start_pos);
- EXPECT_EQ(INT_MAX, rtp_length);
+ EXPECT_EQ(SIZE_MAX, start_pos);
+ EXPECT_EQ(SIZE_MAX, rtp_length);
}
// This test verifies incorrectly formed TURN channel messages.
TEST(P2PSocketHostTest, TestInvalidTurnChannelMessages) {
- int start_pos = INT_MAX, rtp_length = INT_MAX;
+ size_t start_pos = SIZE_MAX, rtp_length = SIZE_MAX;
EXPECT_FALSE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kTurnChannelMsgNoRtpPacket),
sizeof(kTurnChannelMsgNoRtpPacket),
&start_pos, &rtp_length));
- EXPECT_EQ(INT_MAX, start_pos);
- EXPECT_EQ(INT_MAX, rtp_length);
+ EXPECT_EQ(SIZE_MAX, start_pos);
+ EXPECT_EQ(SIZE_MAX, rtp_length);
EXPECT_FALSE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kTurnChannelMsgWithZeroLength),
sizeof(kTurnChannelMsgWithZeroLength),
&start_pos, &rtp_length));
- EXPECT_EQ(INT_MAX, start_pos);
- EXPECT_EQ(INT_MAX, rtp_length);
+ EXPECT_EQ(SIZE_MAX, start_pos);
+ EXPECT_EQ(SIZE_MAX, rtp_length);
}
// This test verifies parsing of a valid RTP packet which has 2byte header
// extension instead of a 1 byte header extension.
TEST(P2PSocketHostTest, TestValid2ByteExtnHdrRtpMessage) {
- int start_pos = INT_MAX, rtp_length = INT_MAX;
+ size_t start_pos = SIZE_MAX, rtp_length = SIZE_MAX;
EXPECT_TRUE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kRtpMsgWith2ByteExtnHeader),
sizeof(kRtpMsgWith2ByteExtnHeader),
&start_pos, &rtp_length));
- EXPECT_EQ(20, rtp_length);
- EXPECT_EQ(0, start_pos);
+ EXPECT_EQ(20U, rtp_length);
+ EXPECT_EQ(0U, start_pos);
}
// This test verifies parsing of a valid RTP packet which has 1 byte header
// AbsSendTime extension in it.
TEST(P2PSocketHostTest, TestValidRtpPacketWithAbsSendTimeExtension) {
- int start_pos = INT_MAX, rtp_length = INT_MAX;
+ size_t start_pos = SIZE_MAX, rtp_length = SIZE_MAX;
EXPECT_TRUE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kRtpMsgWithAbsSendTimeExtension),
sizeof(kRtpMsgWithAbsSendTimeExtension),
&start_pos, &rtp_length));
- EXPECT_EQ(24, rtp_length);
- EXPECT_EQ(0, start_pos);
+ EXPECT_EQ(24U, rtp_length);
+ EXPECT_EQ(0U, start_pos);
}
// This test verifies parsing of a valid TURN Send Indication messages.
TEST(P2PSocketHostTest, TestValidTurnSendIndicationMessages) {
- int start_pos = INT_MAX, rtp_length = INT_MAX;
+ size_t start_pos = SIZE_MAX, rtp_length = SIZE_MAX;
EXPECT_TRUE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kTurnSendIndicationMsgWithoutRtpExtension),
sizeof(kTurnSendIndicationMsgWithoutRtpExtension),
&start_pos, &rtp_length));
- EXPECT_EQ(12, rtp_length);
- EXPECT_EQ(32, start_pos);
+ EXPECT_EQ(12U, rtp_length);
+ EXPECT_EQ(32U, start_pos);
- start_pos = INT_MAX, rtp_length = INT_MAX;
+ start_pos = SIZE_MAX, rtp_length = SIZE_MAX;
EXPECT_TRUE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kTurnSendIndicationMsgWithAbsSendTimeExtension),
sizeof(kTurnSendIndicationMsgWithAbsSendTimeExtension),
&start_pos, &rtp_length));
- EXPECT_EQ(24, rtp_length);
- EXPECT_EQ(32, start_pos);
+ EXPECT_EQ(24U, rtp_length);
+ EXPECT_EQ(32U, start_pos);
}
// This test verifies parsing of valid TURN Channel Messages.
TEST(P2PSocketHostTest, TestValidTurnChannelMessages) {
- int start_pos = -1, rtp_length = -1;
+ size_t start_pos = 0, rtp_length = 0;
EXPECT_TRUE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kTurnChannelMsgWithRtpPacket),
sizeof(kTurnChannelMsgWithRtpPacket), &start_pos, &rtp_length));
- EXPECT_EQ(12, rtp_length);
- EXPECT_EQ(4, start_pos);
+ EXPECT_EQ(12U, rtp_length);
+ EXPECT_EQ(4U, start_pos);
- start_pos = -1, rtp_length = -1;
+ start_pos = 0, rtp_length = 0;
EXPECT_TRUE(packet_processing_helpers::GetRtpPacketStartPositionAndLength(
reinterpret_cast<char*>(kTurnChannelMsgWithAbsSendTimeExtension),
sizeof(kTurnChannelMsgWithAbsSendTimeExtension),
&start_pos, &rtp_length));
- EXPECT_EQ(20, rtp_length);
- EXPECT_EQ(4, start_pos);
+ EXPECT_EQ(20U, rtp_length);
+ EXPECT_EQ(4U, start_pos);
}
// Verify handling of a 2 byte extension header RTP messsage. Currently we don't

Powered by Google App Engine
This is Rietveld 408576698