1 files changed, 12 insertions, 5 deletions

diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 739003a4..59a068c8 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -32,6 +32,11 @@
 #define CONN_ESTABLISHED 3
 #define CONN_TIMED_OUT 4
 
+static uint8_t crypt_connection_id_not_valid(Net_Crypto *c, int crypt_connection_id)
+{
+    return (uint32_t)crypt_connection_id >= c->crypto_connections_length;
+}
+
 /* Use this instead of memcmp; not vulnerable to timing attacks. */
 uint8_t crypto_iszero(uint8_t *mem, uint32_t length)
 {
@@ -150,7 +155,7 @@ void random_nonce(uint8_t *nonce)
  */
 int read_cryptpacket(Net_Crypto *c, int crypt_connection_id, uint8_t *data)
 {
-    if (crypt_connection_id < 0 || crypt_connection_id >= c->crypto_connections_length)
+    if (crypt_connection_id_not_valid(c, crypt_connection_id))
         return 0;
 
     if (c->crypto_connections[crypt_connection_id].status != CONN_ESTABLISHED)
@@ -182,7 +187,7 @@ int read_cryptpacket(Net_Crypto *c, int crypt_connection_id, uint8_t *data)
  */
 int write_cryptpacket(Net_Crypto *c, int crypt_connection_id, uint8_t *data, uint32_t length)
 {
-    if (crypt_connection_id < 0 || crypt_connection_id >= c->crypto_connections_length)
+    if (crypt_connection_id_not_valid(c, crypt_connection_id))
         return 0;
 
     if (length - crypto_box_BOXZEROBYTES + crypto_box_ZEROBYTES > MAX_DATA_SIZE - 1)
@@ -305,7 +310,9 @@ static int cryptopacket_handle(void *object, IP_Port source, uint8_t *packet, ui
                     len);
 
         } else { /* If request is not for us, try routing it. */
-            if (route_packet(dht, packet + 1, packet, length) == length)
+            int retval = route_packet(dht, packet + 1, packet, length);
+
+            if ((unsigned int)retval == length)
                 return 0;
         }
     }
@@ -512,7 +519,7 @@ int crypto_inbound(Net_Crypto *c, uint8_t *public_key, uint8_t *secret_nonce, ui
  */
 int crypto_kill(Net_Crypto *c, int crypt_connection_id)
 {
-    if (crypt_connection_id < 0 || crypt_connection_id >= c->crypto_connections_length)
+    if (crypt_connection_id_not_valid(c, crypt_connection_id))
         return 1;
 
     if (c->crypto_connections[crypt_connection_id].status != CONN_NO_CONNECTION) {
@@ -604,7 +611,7 @@ int accept_crypto_inbound(Net_Crypto *c, int connection_id, uint8_t *public_key,
  */
 int is_cryptoconnected(Net_Crypto *c, int crypt_connection_id)
 {
-    if (crypt_connection_id >= 0 && crypt_connection_id < c->crypto_connections_length)
+    if ((unsigned int)crypt_connection_id < c->crypto_connections_length)
         return c->crypto_connections[crypt_connection_id].status;
 
     return CONN_NO_CONNECTION;