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

fix more potential segfaults

Browse Source
This commit is contained in:
Jfreegman 2013-09-03 01:02:58 -04:00
parent 094311785e
commit 577f42c075
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/prompt.c
View File

@ -109,6 +109,11 @@ void cmd_accept(ToxWindow *self, Tox *m, int argc, char **argv)
void cmd_add(ToxWindow *self, Tox *m, int argc, char **argv) void cmd_add(ToxWindow *self, Tox *m, int argc, char **argv)
{ {
if (argc != 1 && argc != 2) {
wprintw(self->window, "Invalid syntax.\n");
return;
}
uint8_t id_bin[TOX_FRIEND_ADDRESS_SIZE]; uint8_t id_bin[TOX_FRIEND_ADDRESS_SIZE];
char xx[3]; char xx[3];
uint32_t x; uint32_t x;
@ -116,19 +121,14 @@ void cmd_add(ToxWindow *self, Tox *m, int argc, char **argv)
char *msg; char *msg;
int i, num; int i, num;
/* check arguments */
if (argv[2] && argv[2][0] != '\"') {
wprintw(self->window, "Messages must be enclosed in quotes.\n");
return;
}
if (argc != 1 && argc != 2) {
wprintw(self->window, "Invalid syntax.\n");
return;
}
id = argv[1]; id = argv[1];
if (argc == 2) { if (argc == 2) {
if (argv[2][0] != '\"') {
wprintw(self->window, "Messages must be enclosed in quotes.\n");
return;
}
msg = argv[2]; msg = argv[2];
msg[strlen(++msg)-1] = L'\0'; msg[strlen(++msg)-1] = L'\0';
} else } else
@ -379,6 +379,11 @@ void cmd_status(ToxWindow *self, Tox *m, int argc, char **argv)
void cmd_note(ToxWindow *self, Tox *m, int argc, char **argv) void cmd_note(ToxWindow *self, Tox *m, int argc, char **argv)
{ {
if (argc != 1) {
wprintw(self->window, "Wrong number of arguments.\n");
return;
}
char *msg; char *msg;
/* check arguments */ /* check arguments */
@ -386,10 +391,6 @@ void cmd_note(ToxWindow *self, Tox *m, int argc, char **argv)
wprintw(self->window, "Messages must be enclosed in quotes.\n"); wprintw(self->window, "Messages must be enclosed in quotes.\n");
return; return;
} }
if (argc != 1) {
wprintw(self->window, "Wrong number of arguments.\n");
return;
}
msg = argv[1]; msg = argv[1];
msg[strlen(++msg)-1] = L'\0'; msg[strlen(++msg)-1] = L'\0';