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

Merge pull request #251 from embassy-rs/net-fix

Browse Source 
net/tcp: Fix panic when consuming 0 bytes at EOF
This commit is contained in:
Dario Nieuwenhuis 2021-06-18 02:06:41 +02:00 committed by GitHub
commit 06d69a8028
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
embassy-net/src/tcp_socket.rs
View File

@ -151,6 +151,11 @@ impl<'a> AsyncBufRead for TcpSocket<'a> {
} }
fn consume(self: Pin<&mut Self>, amt: usize) { fn consume(self: Pin<&mut Self>, amt: usize) {
if amt == 0 {
// smoltcp's recv returns Finished if we're at EOF,
// even if we're "reading" 0 bytes.
return;
}
self.with(|s| s.recv(|_| (amt, ()))).unwrap() self.with(|s| s.recv(|_| (amt, ()))).unwrap()
} }
} }