1 files changed, 24 insertions, 7 deletions

diff --git a/core/Messenger.c b/core/Messenger.c
index 44fe5f94..90dfe48d 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -51,18 +51,27 @@ static uint8_t *self_statusmessage;
 static uint16_t self_statusmessage_len;
 static USERSTATUS self_userstatus;
 
-#define MAX_NUM_FRIENDS 256
-
-static Friend friendlist[MAX_NUM_FRIENDS];
-
+static Friend *friendlist;
 static uint32_t numfriends;
 
+
 static void set_friend_status(int friendnumber, uint8_t status);
 
 /* 1 if we are online
    0 if we are offline
    static uint8_t online; */
 
+/* set the size of the friend list to numfriends
+   return -1 if realloc fails */
+int realloc_friendlist(uint32_t num) {
+    Friend *newfriendlist = realloc(friendlist, num*sizeof(Friend));
+    if (newfriendlist == NULL)
+        return -1;
+    memset(&newfriendlist[num-1], 0, sizeof(Friend));
+    friendlist = newfriendlist;
+    return 0;
+}
+
 /* return the friend id associated to that public key.
    return -1 if no such friend */
 int getfriend_id(uint8_t *client_id)
@@ -120,8 +129,11 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
     if (getfriend_id(client_id) != -1)
         return FAERR_ALREADYSENT;
 
+    /* resize the friend list if necessary */
+    realloc_friendlist(numfriends + 1);
+
     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 */
+    for (i = 0; i <= numfriends; ++i)  {
         if (friendlist[i].status == NOFRIEND) {
             DHT_addfriend(client_id);
             set_friend_status(i, FRIEND_ADDED);
@@ -147,8 +159,12 @@ int m_addfriend_norequest(uint8_t * client_id)
 {
     if (getfriend_id(client_id) != -1)
         return -1;
+
+    /* resize the friend list if necessary */
+    realloc_friendlist(numfriends + 1);
+
     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 */
+    for (i = 0; i <= numfriends; ++i) {
         if(friendlist[i].status == NOFRIEND) {
             DHT_addfriend(client_id);
             set_friend_status(i, FRIEND_REQUESTED);
@@ -160,7 +176,7 @@ int m_addfriend_norequest(uint8_t * client_id)
             friendlist[i].userstatus = USERSTATUS_NONE;
             friendlist[i].message_id = 0;
             friendlist[i].receives_read_receipts = 1; /* default: YES */
-            numfriends++;
+            ++numfriends;
             return i;
         }
     }
@@ -186,6 +202,7 @@ int m_delfriend(int friendnumber)
             break;
     }
     numfriends = i;
+    realloc_friendlist(numfriends + 1);
 
     return 0;
 }