max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #772

Browse Source 
772: nrf/buffered_uarte: fix out of bounds on read. r=Dirbaio a=Dirbaio

🙈 

bors r+

Co-authored-by: Dario Nieuwenhuis <dirbaio@dirbaio.net>
This commit is contained in:
bors[bot] 2022-05-14 00:21:27 +00:00 committed by GitHub
commit 3d1501c020
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embassy-nrf/src/buffered_uarte.rs
View File

@ -216,7 +216,7 @@ impl<'d, U: UarteInstance, T: TimerInstance> embedded_io::asynch::Read for Buffe
let data = state.rx.pop_buf(); let data = state.rx.pop_buf();
if !data.is_empty() { if !data.is_empty() {
trace!(" got {:?} {:?}", data.as_ptr() as u32, data.len()); trace!(" got {:?} {:?}", data.as_ptr() as u32, data.len());
let len = data.len().min(data.len()); let len = data.len().min(buf.len());
buf[..len].copy_from_slice(&data[..len]); buf[..len].copy_from_slice(&data[..len]);
state.rx.pop(len); state.rx.pop(len);
do_pend = true; do_pend = true;