Skip to content

Commit a402fb2

Browse files
committed
std::rt::uv::net: Handle read_start error
cc #9605
1 parent c5295f9 commit a402fb2

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

src/libstd/rt/uv/net.rs

+13-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use rt::uv::uvll;
1414
use rt::uv::uvll::*;
1515
use rt::uv::{AllocCallback, ConnectionCallback, ReadCallback, UdpReceiveCallback, UdpSendCallback};
1616
use rt::uv::{Loop, Watcher, Request, UvError, Buf, NativeHandle, NullCallback,
17-
status_to_maybe_uv_error};
17+
status_to_maybe_uv_error, vec_to_uv_buf};
1818
use rt::io::net::ip::{SocketAddr, Ipv4Addr, Ipv6Addr};
1919
use vec;
2020
use str;
@@ -147,7 +147,18 @@ impl StreamWatcher {
147147
data.read_cb = Some(cb);
148148
}
149149

150-
unsafe { uvll::read_start(self.native_handle(), alloc_cb, read_cb); }
150+
let ret = unsafe { uvll::read_start(self.native_handle(), alloc_cb, read_cb) };
151+
152+
if ret != 0 {
153+
// uvll::read_start failed, so read_cb will not be called.
154+
// Call it manually for scheduling.
155+
call_read_cb(self.native_handle(), ret as ssize_t);
156+
}
157+
158+
fn call_read_cb(stream: *uvll::uv_stream_t, errno: ssize_t) {
159+
#[fixed_stack_segment]; #[inline(never)];
160+
read_cb(stream, errno, vec_to_uv_buf(~[]));
161+
}
151162

152163
extern fn alloc_cb(stream: *uvll::uv_stream_t, suggested_size: size_t) -> Buf {
153164
let mut stream_watcher: StreamWatcher = NativeHandle::from_native_handle(stream);

0 commit comments

Comments
 (0)