zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fail instead of crashing while writing invalid dependency descriptor

Browse Source 
Bug: webrtc:10342
Change-Id: Ic9af7913aa9835450877940fc5cf29bebf774484
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/224082
Reviewed-by: Emil Lundmark <lndmrk@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34379}
This commit is contained in:
Danil Chapovalov
2021-06-28 11:43:52 +02:00
committed by WebRTC LUCI CQ
parent 80090467aa
commit 53f1fe4ff6
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/rtp_rtcp/source/rtp_dependency_descriptor_extension_unittest.cc
View File

@ -115,5 +115,23 @@ TEST(RtpDependencyDescriptorExtensionTest,
buffer, structure, active_chains, descriptor)); buffer, structure, active_chains, descriptor));
} }
TEST(RtpDependencyDescriptorExtensionTest, FailsToWriteInvalidDescriptor) {
uint8_t buffer[256];
FrameDependencyStructure structure;
structure.num_decode_targets = 2;
structure.num_chains = 2;
structure.templates = {
FrameDependencyTemplate().T(0).Dtis("SR").ChainDiffs({2, 2})};
DependencyDescriptor descriptor;
descriptor.frame_dependencies = structure.templates[0];
descriptor.frame_dependencies.temporal_id = 1;
EXPECT_EQ(
RtpDependencyDescriptorExtension::ValueSize(structure, 0b11, descriptor),
0u);
EXPECT_FALSE(RtpDependencyDescriptorExtension::Write(buffer, structure, 0b11,
descriptor));
}
} // namespace } // namespace
} // namespace webrtc } // namespace webrtc

11
modules/rtp_rtcp/source/rtp_dependency_descriptor_writer.cc
View File

@ -66,6 +66,9 @@ RtpDependencyDescriptorWriter::RtpDependencyDescriptorWriter(
} }
bool RtpDependencyDescriptorWriter::Write() { bool RtpDependencyDescriptorWriter::Write() {
if (build_failed_) {
return false;
}
WriteMandatoryFields(); WriteMandatoryFields();
if (HasExtendedFields()) { if (HasExtendedFields()) {
WriteExtendedFields(); WriteExtendedFields();
@ -83,6 +86,9 @@ bool RtpDependencyDescriptorWriter::Write() {
} }
int RtpDependencyDescriptorWriter::ValueSizeBits() const { int RtpDependencyDescriptorWriter::ValueSizeBits() const {
if (build_failed_) {
return 0;
}
static constexpr int kMandatoryFields = 1 + 1 + 6 + 16; static constexpr int kMandatoryFields = 1 + 1 + 6 + 16;
int value_size_bits = kMandatoryFields + best_template_.extra_size_bits; int value_size_bits = kMandatoryFields + best_template_.extra_size_bits;
if (HasExtendedFields()) { if (HasExtendedFields()) {
@ -172,7 +178,10 @@ void RtpDependencyDescriptorWriter::FindBestTemplate() {
frame_template.temporal_id; frame_template.temporal_id;
}; };
auto first = absl::c_find_if(templates, same_layer); auto first = absl::c_find_if(templates, same_layer);
RTC_CHECK(first != templates.end()); if (first == templates.end()) {
build_failed_ = true;
return;
}
auto last = std::find_if_not(first, templates.end(), same_layer); auto last = std::find_if_not(first, templates.end(), same_layer);
best_template_ = CalculateMatch(first); best_template_ = CalculateMatch(first);