Don't let exceptions from the socket fall out of Client::data_available

[libs/net.git] / source / client.cpp

diff --git a/source/client.cpp b/source/client.cpp
index 6801ad2a3fc73cae566170577ad03b20f0182dc3..7e4ffb39e936e63d08394fe322dc2824318df755 100644 (file)
--- a/source/client.cpp
+++ b/source/client.cpp
@@ -122,7 +122,19 @@ void Client::connect_finished(int err)
 void Client::data_available()
 {
        char rbuf[4096];
-       unsigned len = sock->read(rbuf, sizeof(rbuf));
+       unsigned len;
+       try
+       {
+               len = sock->read(rbuf, sizeof(rbuf));
+       }
+       catch(const SystemError &e)
+       {
+               signal_socket_error.emit(e.get_error_code());
+               return;
+       }
+
+       if(!len)
+               return;
        in_buf.append(rbuf, len);
 
        if(!response)