Add more OSError exceptions to socket

palaviv · palaviv · commit 76c43457b585 · 2019-03-08T17:05:05.000+02:00
diff --git a/tests/snippets/stdlib_socket.py b/tests/snippets/stdlib_socket.py
@@ -43,6 +43,13 @@
 with assertRaises(TypeError):
 	s.bind((888, 8888))
 
+s.bind(("127.0.0.1", 0))
+with assertRaises(OSError):
+	s.recv(100)
+
+with assertRaises(OSError):
+	s.send(MESSAGE_A)
+
 s.close()
 
 # UDP
@@ -86,6 +93,11 @@
 with assertRaises(OSError):
 	s.bind(("1.2.3.4", 888))
 
+s.bind(("127.0.0.1", 0))
+with assertRaises(OSError):
+	s.sendto(MESSAGE_A, ("1.2.3.4", 888))
+
+s.close()
 ### Errors
 with assertRaises(OSError):
 	socket.socket(100, socket.SOCK_STREAM)
diff --git a/vm/src/stdlib/socket.rs b/vm/src/stdlib/socket.rs
@@ -266,7 +266,7 @@ fn socket_accept(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 
     let (tcp_stream, addr) = match ret {
         Ok((socket, addr)) => (socket, addr),
-        _ => return Err(vm.new_type_error("".to_string())),
+        Err(s) => return Err(vm.new_os_error(s.to_string())),
     };
 
     let socket = RefCell::new(Socket {
@@ -297,7 +297,10 @@ fn socket_recv(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 
     let mut buffer = vec![0u8; objint::get_value(bufsize).to_usize().unwrap()];
     match socket.con {
-        Some(ref mut v) => v.read_exact(&mut buffer).unwrap(),
+        Some(ref mut v) => match v.read_exact(&mut buffer) {
+            Ok(_) => (),
+            Err(s) => return Err(vm.new_os_error(s.to_string())),
+        },
         None => return Err(vm.new_type_error("".to_string())),
     };
     Ok(vm.ctx.new_bytes(buffer))
@@ -320,7 +323,7 @@ fn socket_recvfrom(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 
     let addr = match ret {
         Ok((_size, addr)) => addr,
-        _ => return Err(vm.new_type_error("".to_string())),
+        Err(s) => return Err(vm.new_os_error(s.to_string())),
     };
 
     let addr_tuple = get_addr_tuple(vm, addr)?;
@@ -337,7 +340,10 @@ fn socket_send(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let mut socket = get_socket(zelf);
 
     match socket.con {
-        Some(ref mut v) => v.write(&objbytes::get_value(&bytes)).unwrap(),
+        Some(ref mut v) => match v.write(&objbytes::get_value(&bytes)) {
+            Ok(_) => (),
+            Err(s) => return Err(vm.new_os_error(s.to_string())),
+        },
         None => return Err(vm.new_type_error("".to_string())),
     };
     Ok(vm.get_none())
@@ -360,22 +366,24 @@ fn socket_sendto(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     match socket.socket_kind {
         SocketKind::Dgram => {
             match socket.con {
-                Some(ref mut v) => {
-                    if let Ok(_) = v.send_to(&objbytes::get_value(&bytes), address_string) {
-                        Ok(vm.get_none())
-                    } else {
-                        Err(vm.new_type_error("socket failed".to_string()))
-                    }
-                }
+                Some(ref mut v) => match v.send_to(&objbytes::get_value(&bytes), address_string) {
+                    Ok(_) => Ok(vm.get_none()),
+                    Err(s) => Err(vm.new_os_error(s.to_string())),
+                },
                 None => {
                     // Doing implicit bind
-                    if let Ok(dgram) = UdpSocket::bind("0.0.0.0:0") {
-                        if let Ok(_) = dgram.send_to(&objbytes::get_value(&bytes), address_string) {
-                            socket.con = Some(Connection::UdpSocket(dgram));
-                            return Ok(vm.get_none());
+                    match UdpSocket::bind("0.0.0.0:0") {
+                        Ok(dgram) => {
+                            match dgram.send_to(&objbytes::get_value(&bytes), address_string) {
+                                Ok(_) => {
+                                    socket.con = Some(Connection::UdpSocket(dgram));
+                                    Ok(vm.get_none())
+                                }
+                                Err(s) => Err(vm.new_os_error(s.to_string())),
+                            }
                         }
+                        Err(s) => Err(vm.new_os_error(s.to_string())),
                     }
-                    Err(vm.new_type_error("socket failed".to_string()))
                 }
             }
         }
@@ -402,7 +410,7 @@ fn socket_getsockname(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 
     match addr {
         Ok(addr) => get_addr_tuple(vm, addr),
-        _ => Err(vm.new_type_error("".to_string())),
+        Err(s) => Err(vm.new_os_error(s.to_string())),
     }
 }
 
