StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

nTox: fixed 2 possible crashes, 3 incorrect packet lengths

Browse Source
This commit is contained in:
plutooo 2013-08-01 13:15:55 -07:00 committed by irungentoo
parent ebf3d662fe
commit 9fbff0c758
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
testing/nTox.c
View File

@ -133,6 +133,9 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
} }
else if (inpt_command == 'm') { //message command: /m friendnumber messsage else if (inpt_command == 'm') { //message command: /m friendnumber messsage
size_t len = strlen(line); size_t len = strlen(line);
if(len < 3)
return;
char numstring[len-3]; char numstring[len-3];
char message[len-3]; char message[len-3];
int i; int i;
@ -141,13 +144,13 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
numstring[i] = line[i+3]; numstring[i] = line[i+3];
} else { } else {
int j; int j;
for (j = (i+1); j < len; j++) for (j = (i+1); j < (len+1); j++)
message[j-i-1] = line[j+3]; message[j-i-1] = line[j+3];
break; break;
} }
} }
int num = atoi(numstring); int num = atoi(numstring);
if (m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) { if (m_sendmessage(num, (uint8_t*) message, strlen(message) + 1) != 1) {
new_lines("[i] could not send message"); new_lines("[i] could not send message");
} else { } else {
new_lines(format_message(message, -1)); new_lines(format_message(message, -1));
@ -162,7 +165,7 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
name[i-3] = line[i]; name[i-3] = line[i];
} }
name[i-3] = 0; name[i-3] = 0;
setname(name, i); setname(name, i - 2);
char numstring[100]; char numstring[100];
sprintf(numstring, "[i] changed nick to %s", (char*)name); sprintf(numstring, "[i] changed nick to %s", (char*)name);
new_lines(numstring); new_lines(numstring);
@ -179,7 +182,7 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
status[i-3] = line[i]; status[i-3] = line[i];
} }
status[i-3] = 0; status[i-3] = 0;
m_set_userstatus(status, strlen((char*)status)); m_set_userstatus(status, strlen((char*)status) + 1);
char numstring[100]; char numstring[100];
sprintf(numstring, "[i] changed status to %s", (char*)status); sprintf(numstring, "[i] changed status to %s", (char*)status);
new_lines(numstring); new_lines(numstring);