1 files changed, 31 insertions, 14 deletions

diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 424677d14..2f0de030d 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -533,14 +533,21 @@ read_dns4 (void *cls)
     }
   {
     char buf[size + 1];
+    ssize_t sret;
 
     addrlen = sizeof (v4);
-    GNUNET_break (size ==
-                  GNUNET_NETWORK_socket_recvfrom (listen_socket4,
-                                                  buf,
-                                                  size + 1,
-                                                  (struct sockaddr *) &v4,
-                                                  &addrlen));
+    sret = GNUNET_NETWORK_socket_recvfrom (listen_socket4,
+                                           buf,
+                                           size + 1,
+                                           (struct sockaddr *) &v4,
+                                           &addrlen);
+    if (0 > sret)
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                           "recvfrom");
+      return;
+    }
+    GNUNET_break (size == (size_t) sret);
     handle_request (listen_socket4,
                     &v4,
                     addrlen,
@@ -579,16 +586,26 @@ read_dns6 (void *cls)
     }
   {
     char buf[size];
+    ssize_t sret;
 
     addrlen = sizeof (v6);
-    GNUNET_break (size ==
-                  GNUNET_NETWORK_socket_recvfrom (listen_socket6,
-                                                  buf,
-                                                  size,
-                                                  (struct sockaddr *) &v6,
-                                                  &addrlen));
-    handle_request (listen_socket6, &v6, addrlen,
-                    buf, size);
+    sret = GNUNET_NETWORK_socket_recvfrom (listen_socket6,
+                                           buf,
+                                           size,
+                                           (struct sockaddr *) &v6,
+                                           &addrlen);
+    if (0 > sret)
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                           "recvfrom");
+      return;
+    }
+    GNUNET_break (size == (size_t) sret);
+    handle_request (listen_socket6,
+                    &v6,
+                    addrlen,
+                    buf,
+                    size);
   }
 }