3 files changed, 20 insertions, 7 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 594e3e7b..3e5486a5 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -164,12 +164,17 @@ void to_net_family(IP *ip)
         ip->family = TOX_AF_INET6;
 }
 
-void to_host_family(IP *ip)
+int to_host_family(IP *ip)
 {
-    if (ip->family == TOX_AF_INET)
+    if (ip->family == TOX_AF_INET) {
         ip->family = AF_INET;
-    else if (ip->family == TOX_AF_INET6)
+        return 0;
+    } else if (ip->family == TOX_AF_INET6) {
         ip->family = AF_INET6;
+        return 0;
+    } else {
+        return -1;
+    }
 }
 
 /* Pack number of nodes into data of maxlength length.
diff --git a/toxcore/DHT.h b/toxcore/DHT.h
index 3f7a820e..547f3887 100644
--- a/toxcore/DHT.h
+++ b/toxcore/DHT.h
@@ -65,7 +65,9 @@
 
 /* Functions to transfer ips safely across wire. */
 void to_net_family(IP *ip);
-void to_host_family(IP *ip);
+
+/* return 0 on success, -1 on failure. */
+int to_host_family(IP *ip);
 
 typedef struct {
     IP_Port     ip_port;
diff --git a/toxcore/onion.c b/toxcore/onion.c
index 0982a2b0..1ce8146e 100644
--- a/toxcore/onion.c
+++ b/toxcore/onion.c
@@ -294,7 +294,9 @@ int onion_send_1(const Onion *onion, const uint8_t *plain, uint16_t len, IP_Port
 
     IP_Port send_to;
     ipport_unpack(&send_to, plain);
-    to_host_family(&send_to.ip);
+
+    if (to_host_family(&send_to.ip) == -1)
+        return 1;
 
     uint8_t ip_port[SIZE_IPPORT];
     ipport_pack(ip_port, &source);
@@ -343,7 +345,9 @@ static int handle_send_1(void *object, IP_Port source, const uint8_t *packet, ui
 
     IP_Port send_to;
     ipport_unpack(&send_to, plain);
-    to_host_family(&send_to.ip);
+
+    if (to_host_family(&send_to.ip) == -1)
+        return 1;
 
     uint8_t data[ONION_MAX_PACKET_SIZE];
     data[0] = NET_PACKET_ONION_SEND_2;
@@ -392,7 +396,9 @@ static int handle_send_2(void *object, IP_Port source, const uint8_t *packet, ui
 
     IP_Port send_to;
     ipport_unpack(&send_to, plain);
-    to_host_family(&send_to.ip);
+
+    if (to_host_family(&send_to.ip) == -1)
+        return 1;
 
     uint8_t data[ONION_MAX_PACKET_SIZE];
     memcpy(data, plain + SIZE_IPPORT, len - SIZE_IPPORT);