From 9dd691d106f3a77e4c679df5d71023ab6a4f4316 Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Fri, 9 Aug 2013 16:34:53 -0400 Subject: Changed the way statusmessage is allocated --- core/Messenger.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'core/Messenger.c') diff --git a/core/Messenger.c b/core/Messenger.c index 1bd0d541..58e6085f 100644 --- a/core/Messenger.c +++ b/core/Messenger.c @@ -47,8 +47,9 @@ uint8_t self_public_key[crypto_box_PUBLICKEYBYTES]; static uint8_t self_name[MAX_NAME_LENGTH]; static uint16_t self_name_length; -static uint8_t *self_statusmessage; -static uint16_t self_statusmessage_len; +static uint8_t self_statusmessage[MAX_STATUSMESSAGE_LENGTH]; +static uint16_t self_statusmessage_length; + static USERSTATUS self_userstatus; static Friend *friendlist; @@ -315,11 +316,8 @@ int m_set_statusmessage(uint8_t *status, uint16_t length) { if (length > MAX_STATUSMESSAGE_LENGTH) return -1; - uint8_t *newstatus = calloc(length, 1); - memcpy(newstatus, status, length); - free(self_statusmessage); - self_statusmessage = newstatus; - self_statusmessage_len = length; + memcpy(self_statusmessage, status, length); + self_statusmessage_length = length; uint32_t i; for (i = 0; i < numfriends; ++i) @@ -565,7 +563,7 @@ static void doFriends(void) friendlist[i].name_sent = 1; } if (friendlist[i].statusmessage_sent == 0) { - if (send_statusmessage(i, self_statusmessage, self_statusmessage_len)) + if (send_statusmessage(i, self_statusmessage, self_statusmessage_length)) friendlist[i].statusmessage_sent = 1; } if (friendlist[i].userstatus_sent == 0) { -- cgit v1.2.3