mirror of
https://github.com/mozilla/cubeb
synced 2024-11-21 14:29:11 -07:00
auto_array: protect from various calls when length_ is 0
cubeb-coreaudio-rs has hit a case when running its tests on MacOS 12 where it fails the `assert(destination && source);` in `PodCopy` because it tried to push 0 samples to an auto_array of length 0, as the internal auto_array buffer had not been allocated yet.
This commit is contained in:
parent
54217bca3f
commit
ed2efe22cb
1 changed files with 15 additions and 6 deletions
|
@ -182,7 +182,9 @@ public:
|
|||
if (length_ + length > capacity_) {
|
||||
reserve(length_ + length);
|
||||
}
|
||||
PodCopy(data_ + length_, elements, length);
|
||||
if (data_) {
|
||||
PodCopy(data_ + length_, elements, length);
|
||||
}
|
||||
length_ += length;
|
||||
}
|
||||
|
||||
|
@ -195,12 +197,14 @@ public:
|
|||
if (length_ + length > capacity_) {
|
||||
reserve(length + length_);
|
||||
}
|
||||
PodZero(data_ + length_, length);
|
||||
if (data_) {
|
||||
PodZero(data_ + length_, length);
|
||||
}
|
||||
length_ += length;
|
||||
}
|
||||
|
||||
/** Prepend `length` zero-ed elements to the end of the array, resizing the
|
||||
* array if needed.
|
||||
/** Prepend `length` zero-ed elements to the front of the array, resizing and
|
||||
* shifting the array if needed.
|
||||
* @parameter length the number of elements to prepend to the array.
|
||||
*/
|
||||
void push_front_silence(size_t length)
|
||||
|
@ -208,8 +212,10 @@ public:
|
|||
if (length_ + length > capacity_) {
|
||||
reserve(length + length_);
|
||||
}
|
||||
PodMove(data_ + length, data_, length_);
|
||||
PodZero(data_, length);
|
||||
if (data_) {
|
||||
PodMove(data_ + length, data_, length_);
|
||||
PodZero(data_, length);
|
||||
}
|
||||
length_ += length;
|
||||
}
|
||||
|
||||
|
@ -227,6 +233,9 @@ public:
|
|||
if (length > length_) {
|
||||
return false;
|
||||
}
|
||||
if (!data_) {
|
||||
return true;
|
||||
}
|
||||
if (elements) {
|
||||
PodCopy(elements, data_, length);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue