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

Fix crash when appending empty array to AudioMultiVector.

Browse Source 
Bug: webrtc:14442,chromium:1367993
Change-Id: I9453e300a6d3d78571d08cc65770787e13d43885
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/276620
Commit-Queue: Jakob Ivarsson‎ <jakobi@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38208}
This commit is contained in:
Jakob Ivarsson 2022-09-23 22:03:09 +02:00 committed by WebRTC LUCI CQ
parent 2ae3f7bb60
commit 136ef25acb
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/audio_coding/neteq/audio_multi_vector.cc
View File

@ -69,6 +69,9 @@ void AudioMultiVector::CopyTo(AudioMultiVector* copy_to) const {
void AudioMultiVector::PushBackInterleaved(
rtc::ArrayView<const int16_t> append_this) {
RTC_DCHECK_EQ(append_this.size() % num_channels_, 0);
if (append_this.empty()) {
return;
}
if (num_channels_ == 1) {
// Special case to avoid extra allocation and data shuffling.
channels_[0]->PushBack(append_this.data(), append_this.size());
@ -78,11 +81,8 @@ void AudioMultiVector::PushBackInterleaved(
int16_t* temp_array = new int16_t[length_per_channel]; // Temporary storage.
for (size_t channel = 0; channel < num_channels_; ++channel) {
// Copy elements to `temp_array`.
// Set `source_ptr` to first element of this channel.
const int16_t* source_ptr = &append_this[channel];
for (size_t i = 0; i < length_per_channel; ++i) {
temp_array[i] = *source_ptr;
source_ptr += num_channels_; // Jump to next element of this channel.
temp_array[i] = append_this[channel + i * num_channels_];
}
channels_[channel]->PushBack(temp_array, length_per_channel);
}

6
modules/audio_coding/neteq/audio_multi_vector_unittest.cc
View File

@ -309,6 +309,12 @@ TEST_P(AudioMultiVectorTest, CopyChannel) {
}
}
TEST_P(AudioMultiVectorTest, PushBackEmptyArray) {
AudioMultiVector vec(num_channels_);
vec.PushBackInterleaved({});
EXPECT_TRUE(vec.Empty());
}
INSTANTIATE_TEST_SUITE_P(TestNumChannels,
AudioMultiVectorTest,
::testing::Values(static_cast<size_t>(1),