Skip to content

Commit e6e3e9c

Browse files
niceskyleileibeiyi
andauthored
fix: return a WriteZero error if frames cannot be written (#783)
Some operating systems will allow you continually call `write()` on a closed socket, and will return `Ok(0)` instead of an error. This patch checks for a zero write, and instead of looping forever trying to write, returns a proper error. Closes #781 Co-authored-by: leibeiyi <[email protected]>
1 parent 357127e commit e6e3e9c

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/codec/framed_write.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ where
133133

134134
loop {
135135
while !self.encoder.is_empty() {
136-
match self.encoder.next {
136+
let n = match self.encoder.next {
137137
Some(Next::Data(ref mut frame)) => {
138138
tracing::trace!(queued_data_frame = true);
139139
let mut buf = (&mut self.encoder.buf).chain(frame.payload_mut());
@@ -148,6 +148,12 @@ where
148148
))?
149149
}
150150
};
151+
if n == 0 {
152+
return Poll::Ready(Err(io::Error::new(
153+
io::ErrorKind::WriteZero,
154+
"failed to write frame to socket",
155+
)));
156+
}
151157
}
152158

153159
match self.encoder.unset_frame() {

0 commit comments

Comments
 (0)