admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdp: reject sdp with malformed b= lines

Browse Source 
BUG=webrtc:3782

Change-Id: I3d137b0b74565f7e85bbc6b453e73731a94c2b04
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179360
Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
Reviewed-by: Taylor <deadbeef@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31838}
This commit is contained in:
Philipp Hancke 2020-07-31 08:30:50 +02:00 committed by Commit Bot
parent 358df5fb4d
commit fbbfc02698
2 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pc/webrtc_sdp.cc
View File

@ -2992,17 +2992,17 @@ bool ParseContent(const std::string& message,
if (IsLineType(line, kLineTypeSessionBandwidth)) {
std::string bandwidth;
std::string bandwidth_type;
if (HasAttribute(line, kApplicationSpecificBandwidth)) {
if (!GetValue(line, kApplicationSpecificBandwidth, &bandwidth, error)) {
return false;
}
bandwidth_type = kApplicationSpecificBandwidth;
} else if (HasAttribute(line, kTransportSpecificBandwidth)) {
if (!GetValue(line, kTransportSpecificBandwidth, &bandwidth, error)) {
return false;
}
bandwidth_type = kTransportSpecificBandwidth;
} else {
if (!rtc::tokenize_first(line.substr(kLinePrefixLength),
kSdpDelimiterColonChar, &bandwidth_type,
&bandwidth)) {
return ParseFailed(
line,
"b= syntax error, does not match b=<modifier>:<bandwidth-value>.",
error);
}
if (!(bandwidth_type == kApplicationSpecificBandwidth ||
bandwidth_type == kTransportSpecificBandwidth)) {
// Ignore unknown bandwidth types.
continue;
}
int b = 0;

25
pc/webrtc_sdp_unittest.cc
View File

@ -2645,6 +2645,24 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithTiasBandwidth) {
EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_bandwidth));
}
TEST_F(WebRtcSdpTest,
DeserializeSessionDescriptionWithUnknownBandwidthModifier) {
JsepSessionDescription jdesc_with_bandwidth(kDummyType);
std::string sdp_with_bandwidth = kSdpFullString;
InjectAfter("a=mid:video_content_name\r\na=sendrecv\r\n",
"b=unknown:100000\r\n", &sdp_with_bandwidth);
InjectAfter("a=mid:audio_content_name\r\na=sendrecv\r\n",
"b=unknown:50000\r\n", &sdp_with_bandwidth);
EXPECT_TRUE(SdpDeserialize(sdp_with_bandwidth, &jdesc_with_bandwidth));
VideoContentDescription* vcd = GetFirstVideoContentDescription(&desc_);
vcd->set_bandwidth(-1);
AudioContentDescription* acd = GetFirstAudioContentDescription(&desc_);
acd->set_bandwidth(-1);
ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
jdesc_.session_version()));
EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_bandwidth));
}
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithIceOptions) {
JsepSessionDescription jdesc_with_ice_options(kDummyType);
std::string sdp_with_ice_options = kSdpFullString;
@ -3369,6 +3387,13 @@ TEST_F(WebRtcSdpTest, DeserializeSdpWithInvalidAttributeValue) {
// bandwidth
ExpectParseFailureWithNewLines("a=mid:video_content_name\r\n",
"b=AS:badvalue\r\n", "b=AS:badvalue");
ExpectParseFailureWithNewLines("a=mid:video_content_name\r\n", "b=AS\r\n",
"b=AS");
ExpectParseFailureWithNewLines("a=mid:video_content_name\r\n", "b=AS:\r\n",
"b=AS:");
ExpectParseFailureWithNewLines("a=mid:video_content_name\r\n",
"b=AS:12:34\r\n", "b=AS:12:34");
// rtcp-fb
ExpectParseFailureWithNewLines("a=mid:video_content_name\r\n",
"a=rtcp-fb:badvalue nack\r\n",