mirror-github-bspeice/aeron-rs
1
0
Fork 0
mirror of https://github.com/bspeice/aeron-rs synced 2024-12-21 21:38:09 -05:00
Code Issues Releases Wiki Activity

Fix the bounds check

Browse Source
This commit is contained in:
Bradlee Speice 2019-10-03 22:40:10 -04:00
parent 4611034b7b
commit 38eea0224f
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/client/concurrent/atomic_buffer.rs
View File

@ -26,7 +26,7 @@ impl<'a> AtomicBuffer<'a> {
} }
fn bounds_check(&self, offset: IndexT, size: usize) -> Result<()> { fn bounds_check(&self, offset: IndexT, size: usize) -> Result<()> {
if self.buffer.len() - offset as usize > size { if self.buffer.len() - (offset as usize) < size {
Err(AeronError::OutOfBounds) Err(AeronError::OutOfBounds)
} else { } else {
Ok(()) Ok(())
@ -51,6 +51,7 @@ mod tests {
use std::sync::atomic::{AtomicU64, Ordering}; use std::sync::atomic::{AtomicU64, Ordering};
use crate::client::concurrent::atomic_buffer::AtomicBuffer; use crate::client::concurrent::atomic_buffer::AtomicBuffer;
use crate::util::AeronError;
#[test] #[test]
fn mmap_to_atomic() { fn mmap_to_atomic() {
@ -89,4 +90,20 @@ mod tests {
assert_eq!(atomic_buf.get_and_add_i64(1, 1), Ok(16)); assert_eq!(atomic_buf.get_and_add_i64(1, 1), Ok(16));
assert_eq!(atomic_buf.get_and_add_i64(1, 0), Ok(17)); assert_eq!(atomic_buf.get_and_add_i64(1, 0), Ok(17));
} }
#[test]
fn out_of_bounds() {
let mut buf = [16, 0, 0, 0, 0, 0, 0];
let atomic_buf = AtomicBuffer::wrap(&mut buf);
assert_eq!(atomic_buf.get_and_add_i64(0, 0), Err(AeronError::OutOfBounds));
}
#[test]
fn out_of_bounds_offset() {
let mut buf = [16, 0, 0, 0, 0, 0, 0, 0];
let atomic_buf = AtomicBuffer::wrap(&mut buf);
assert_eq!(atomic_buf.get_and_add_i64(1, 0), Err(AeronError::OutOfBounds));
}
} }