Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 02:13:01 +01:00
Code Issues Projects Releases Wiki Activity

string safety

Browse Source
This commit is contained in:
Jfreegman 2014-03-28 03:46:00 -04:00
parent 8c071fb208
commit 21c48bde5c
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chat.c
View File

@ -184,7 +184,8 @@ static void chat_onNickChange(ToxWindow *self, Tox *m, int32_t num, uint8_t *nic
nick[TOXIC_MAX_NAME_LENGTH] = '\0'; nick[TOXIC_MAX_NAME_LENGTH] = '\0';
len = strlen(nick) + 1; len = strlen(nick) + 1;
memcpy(self->name, nick, len); strcpy(self->name, nick);
self->name[len-1] = '\0';
} }
static void chat_onStatusChange(ToxWindow *self, Tox *m, int32_t num, uint8_t status) static void chat_onStatusChange(ToxWindow *self, Tox *m, int32_t num, uint8_t status)
@ -203,7 +204,8 @@ static void chat_onStatusMessageChange(ToxWindow *self, int32_t num, uint8_t *st
StatusBar *statusbar = self->stb; StatusBar *statusbar = self->stb;
statusbar->statusmsg_len = len; statusbar->statusmsg_len = len;
memcpy(statusbar->statusmsg, status, len); strcpy(statusbar->statusmsg, status);
statusbar->statusmsg[len-1] = '\0';
} }
static void chat_onFileSendRequest(ToxWindow *self, Tox *m, int32_t num, uint8_t filenum, static void chat_onFileSendRequest(ToxWindow *self, Tox *m, int32_t num, uint8_t filenum,

6
src/friendlist.c
View File

@ -135,8 +135,9 @@ static void friendlist_onNickChange(ToxWindow *self, Tox *m, int32_t num, uint8_
return; return;
str[TOXIC_MAX_NAME_LENGTH] = '\0'; str[TOXIC_MAX_NAME_LENGTH] = '\0';
strcpy(friends[num].name, str);
len = strlen(str) + 1; len = strlen(str) + 1;
memcpy(friends[num].name, str, len); friends[num].name[len-1] = '\0';
friends[num].namelength = len; friends[num].namelength = len;
sort_friendlist_index(); sort_friendlist_index();
} }
@ -154,7 +155,8 @@ static void friendlist_onStatusMessageChange(ToxWindow *self, int32_t num, uint8
if (len > TOX_MAX_STATUSMESSAGE_LENGTH || num >= max_friends_index) if (len > TOX_MAX_STATUSMESSAGE_LENGTH || num >= max_friends_index)
return; return;
memcpy(friends[num].statusmsg, str, len); strcpy(friends[num].statusmsg, str);
friends[num].statusmsg[len-1] = '\0';
friends[num].statusmsg_len = len; friends[num].statusmsg_len = len;
} }