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

fix nick parsing bug for private messages

Browse Source
This commit is contained in:
Jfreegman 2015-03-22 17:01:46 -04:00
parent 59b90b1328
commit 5caa9bed51
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/groupchat.c
View File

@ -684,22 +684,18 @@ static void send_group_prvt_message(ToxWindow *self, Tox *m, int groupnum, const
} }
size_t i; size_t i;
int peernum = -1, len = 0; int peernum = -1, nick_len = 0;
const char *msg = NULL;
char *nick = NULL; char *nick = NULL;
/* need to match the longest nick in case of nicks that are smaller sub-strings */
for (i = 0; i < groupchats[groupnum].num_peers; ++i) { for (i = 0; i < groupchats[groupnum].num_peers; ++i) {
if (memcmp((char *) &groupchats[groupnum].peer_names[i * TOX_MAX_NAME_LENGTH], data, if (memcmp((char *) &groupchats[groupnum].peer_names[i * TOX_MAX_NAME_LENGTH], data,
groupchats[groupnum].peer_name_lengths[i]) == 0) { groupchats[groupnum].peer_name_lengths[i]) == 0) {
len = strlen(data) - groupchats[groupnum].peer_name_lengths[i] - 1; if (groupchats[groupnum].peer_name_lengths[i] > nick_len) {
nick_len = groupchats[groupnum].peer_name_lengths[i];
if (len <= 0)
return;
msg = data + groupchats[groupnum].peer_name_lengths[i] + 1;
nick = (char *) &groupchats[groupnum].peer_names[i * TOX_MAX_NAME_LENGTH]; nick = (char *) &groupchats[groupnum].peer_names[i * TOX_MAX_NAME_LENGTH];
peernum = i; peernum = i;
break; }
} }
} }
@ -708,7 +704,14 @@ static void send_group_prvt_message(ToxWindow *self, Tox *m, int groupnum, const
return; return;
} }
if (tox_group_private_message_send(m, groupnum, peernum, (uint8_t *) msg, len) == -1) { int msg_len = strlen(data) - groupchats[groupnum].peer_name_lengths[peernum] - 1;
if (msg_len <= 0)
return;
const char *msg = data + groupchats[groupnum].peer_name_lengths[peernum] + 1;
if (tox_group_private_message_send(m, groupnum, peernum, (uint8_t *) msg, msg_len) == -1) {
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, " * Failed to send private message"); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, " * Failed to send private message");
return; return;
} }
@ -717,7 +720,7 @@ static void send_group_prvt_message(ToxWindow *self, Tox *m, int groupnum, const
char pm_nick[TOX_MAX_NAME_LENGTH + 2]; char pm_nick[TOX_MAX_NAME_LENGTH + 2];
strcpy(pm_nick, ">"); strcpy(pm_nick, ">");
strcpy(pm_nick + 1, nick); strcpy(pm_nick + 1, nick);
strcpy(pm_nick + 1 + groupchats[groupnum].peer_name_lengths[i], "<"); strcpy(pm_nick + 1 + groupchats[groupnum].peer_name_lengths[peernum], "<");
char timefrmt[TIME_STR_SIZE]; char timefrmt[TIME_STR_SIZE];
get_time_str(timefrmt, sizeof(timefrmt)); get_time_str(timefrmt, sizeof(timefrmt));