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

adjusting max name length handling

Browse Source
This commit is contained in:
Jfreegman 2013-10-18 23:08:37 -04:00
parent fe0ccf52e9
commit 361c4cfafc
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/chat.c
View File

@ -27,6 +27,7 @@ static void chat_onMessage(ToxWindow *self, Tox *m, int num, uint8_t *msg, uint1
uint8_t nick[TOX_MAX_NAME_LENGTH] = {'\0'}; uint8_t nick[TOX_MAX_NAME_LENGTH] = {'\0'};
tox_getname(m, num, nick); tox_getname(m, num, nick);
nick[TOXIC_MAX_NAME_LENGTH] = '\0';
print_time(ctx->history); print_time(ctx->history);
wattron(ctx->history, COLOR_PAIR(4)); wattron(ctx->history, COLOR_PAIR(4));
@ -62,6 +63,7 @@ static void chat_onAction(ToxWindow *self, Tox *m, int num, uint8_t *action, uin
uint8_t nick[TOX_MAX_NAME_LENGTH] = {'\0'}; uint8_t nick[TOX_MAX_NAME_LENGTH] = {'\0'};
tox_getname(m, num, nick); tox_getname(m, num, nick);
nick[TOXIC_MAX_NAME_LENGTH] = '\0';
print_time(ctx->history); print_time(ctx->history);
wattron(ctx->history, COLOR_PAIR(YELLOW)); wattron(ctx->history, COLOR_PAIR(YELLOW));
@ -77,6 +79,8 @@ static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t
if (self->num != num) if (self->num != num)
return; return;
nick[TOXIC_MAX_NAME_LENGTH] = '\0';
len = strlen(nick) + 1;
memcpy(self->name, nick, len); memcpy(self->name, nick, len);
} }
@ -245,9 +249,6 @@ static void chat_sendfile(ToxWindow *self, ChatContext *ctx, Tox *m, uint8_t *pa
fseek(file_to_send, 0, SEEK_SET); fseek(file_to_send, 0, SEEK_SET);
int friendnum = self->num; int friendnum = self->num;
uint8_t friendname[TOX_MAX_NAME_LENGTH] = {'\0'};
tox_getname(m, friendnum, friendname);
int filenum = tox_new_filesender(m, friendnum, filesize, path, path_len + 1); int filenum = tox_new_filesender(m, friendnum, filesize, path, path_len + 1);
if (filenum == -1) { if (filenum == -1) {

5
src/friendlist.c
View File

@ -42,6 +42,8 @@ static void friendlist_onNickChange(ToxWindow *self, int num, uint8_t *str, uint
if (len >= TOX_MAX_NAME_LENGTH || num < 0 || num >= num_friends) if (len >= TOX_MAX_NAME_LENGTH || num < 0 || num >= num_friends)
return; return;
str[TOXIC_MAX_NAME_LENGTH] = '\0';
len = strlen(str) + 1;
memcpy(friends[num].name, str, len); memcpy(friends[num].name, str, len);
friends[num].namelength = len; friends[num].namelength = len;
} }
@ -82,6 +84,9 @@ int friendlist_onFriendAdded(Tox *m, int num)
if (friends[i].namelength == -1 || friends[i].name[0] == '\0') { if (friends[i].namelength == -1 || friends[i].name[0] == '\0') {
strcpy((char *) friends[i].name, UNKNOWN_NAME); strcpy((char *) friends[i].name, UNKNOWN_NAME);
friends[i].namelength = strlen(UNKNOWN_NAME) + 1; friends[i].namelength = strlen(UNKNOWN_NAME) + 1;
} else { /* Enforce toxic's maximum name length */
friends[i].name[TOXIC_MAX_NAME_LENGTH] = '\0';
friends[i].namelength = strlen(friends[i].name) + 1;
} }
if (i == num_friends) if (i == num_friends)

17
src/windows.c
View File

@ -62,23 +62,6 @@ void on_nickchange(Tox *m, int friendnumber, uint8_t *string, uint16_t length, v
if (friendnumber < 0 || friendnumber > MAX_FRIENDS_NUM) if (friendnumber < 0 || friendnumber > MAX_FRIENDS_NUM)
return; return;
if (length >= TOXIC_MAX_NAME_LENGTH) { /* length includes null byte */
string[TOXIC_MAX_NAME_LENGTH] = L'\0';
length = TOXIC_MAX_NAME_LENGTH + 1;
tox_setfriendname(m, friendnumber, string, length);
}
/* Append friendnumber to duplicate nicks to guarantee uniqueness */
int n = get_friendnum(string);
if (n != friendnumber && n != -1) {
char n_buf[strlen(string)+4]; /* must have room for friendnum chars relative to MAX_FRIENDS_NUM */
snprintf(n_buf, sizeof(n_buf), "%s%d", string, friendnumber);
strcpy(string, n_buf);
length = strlen(n_buf) + 1;
tox_setfriendname(m, friendnumber, string, length);
}
int i; int i;
for (i = 0; i < MAX_WINDOWS_NUM; ++i) { for (i = 0; i < MAX_WINDOWS_NUM; ++i) {