2 files changed, 7 insertions, 3 deletions

diff --git a/core/LAN_discovery.c b/core/LAN_discovery.c
index 55953685..26b3930c 100644
--- a/core/LAN_discovery.c
+++ b/core/LAN_discovery.c
@@ -70,6 +70,10 @@ static uint32_t get_broadcast(void)
         }
     }
     close(sock);
+    if(sock_holder == NULL) {
+        perror("[!] no broadcast device found");
+        return 0;
+    }
 
     return sock_holder->sin_addr.s_addr;
 }
diff --git a/core/Messenger.c b/core/Messenger.c
index 353ce603..33af599d 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -118,8 +118,8 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
         return FAERR_ALREADYSENT;
 
     uint32_t i;
-    for (i = 0; i <= numfriends && i <= MAX_NUM_FRIENDS; ++i) { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */
-        if(friendlist[i].status == NOFRIEND) {
+    for (i = 0; i <= numfriends && i <= MAX_NUM_FRIENDS; ++i)  { /*TODO: dynamic memory allocation to allow for more than MAX_NUM_FRIENDS friends */
+        if (friendlist[i].status == NOFRIEND) {
             DHT_addfriend(client_id);
             friendlist[i].status = FRIEND_ADDED;
             friendlist[i].crypt_connection_id = -1;
@@ -372,7 +372,7 @@ static int send_userstatus(int friendnumber, uint8_t * status, uint16_t length)
     memcpy(thepacket + 2, status, length);
     thepacket[0] = PACKET_ID_USERSTATUS;
     thepacket[1] = self_userstatus_kind;
-    int written = write_cryptpacket(friendlist[friendnumber].crypt_connection_id, thepacket, length + 1);
+    int written = write_cryptpacket(friendlist[friendnumber].crypt_connection_id, thepacket, length + 2);
     free(thepacket);
     return written;
 }