mirror of
https://github.com/iluvcapra/bwavfile.git
synced 2025-12-31 08:50:44 +00:00
Avoid panics when incorrect buffer sizes are provided to read/write_frames
This commit is contained in:
@@ -41,6 +41,12 @@ pub enum Error {
|
||||
|
||||
/// The file is not optimized for writing new data
|
||||
DataChunkNotPreparedForAppend,
|
||||
|
||||
/// A buffer with a length that isn't a multiple of channel_count was provided
|
||||
InvalidBufferSize {
|
||||
buffer_size: usize,
|
||||
channel_count: u16,
|
||||
},
|
||||
}
|
||||
|
||||
impl StdError for Error {}
|
||||
|
||||
@@ -110,12 +110,12 @@ impl<R: Read + Seek> AudioFrameReader<R> {
|
||||
let common_format = self.format.common_format();
|
||||
let bits_per_sample = self.format.bits_per_sample;
|
||||
|
||||
assert!(
|
||||
buffer.len() % channel_count == 0,
|
||||
"read_frames was called with a mis-sized buffer, expected a multiple of {}, was {}",
|
||||
channel_count,
|
||||
buffer.len()
|
||||
);
|
||||
if buffer.len() % channel_count != 0 {
|
||||
return Err(Error::InvalidBufferSize {
|
||||
buffer_size: buffer.len(),
|
||||
channel_count: self.format.channel_count,
|
||||
});
|
||||
}
|
||||
|
||||
let position = self.inner.stream_position()? - self.start;
|
||||
let frames_requested = (buffer.len() / channel_count) as u64;
|
||||
|
||||
@@ -37,21 +37,22 @@ where
|
||||
|
||||
/// Write interleaved samples in `buffer`
|
||||
///
|
||||
/// # Panics
|
||||
///
|
||||
/// This function will panic if `buffer.len()` modulo the Wave file's channel count
|
||||
/// is not zero.
|
||||
pub fn write_frames<S>(&mut self, buffer: &[S]) -> Result<u64, Error>
|
||||
/// The writer will convert from the buffer's sample type into the file's sample type.
|
||||
/// Note that no dithering will be applied during sample type conversion,
|
||||
/// if dithering is required then it will need to be applied manually.
|
||||
pub fn write_frames<S>(&mut self, buffer: &[S]) -> Result<(), Error>
|
||||
where
|
||||
S: Sample,
|
||||
{
|
||||
let format = &self.inner.inner.format;
|
||||
let channel_count = format.channel_count as usize;
|
||||
|
||||
assert!(
|
||||
buffer.len() % channel_count == 0,
|
||||
"frames buffer does not contain a number of samples % channel_count == 0"
|
||||
);
|
||||
if buffer.len() % channel_count != 0 {
|
||||
return Err(Error::InvalidBufferSize {
|
||||
buffer_size: buffer.len(),
|
||||
channel_count: format.channel_count,
|
||||
});
|
||||
}
|
||||
|
||||
let mut write_buffer = self
|
||||
.inner
|
||||
|
||||
Reference in New Issue
Block a user