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

fix potential segfaul and added default friend request msg

Browse Source
This commit is contained in:
Jfreegman 2013-09-07 00:48:21 -04:00
parent dd6a558a62
commit 08d87cc996
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/prompt.c
View File

@ -154,7 +154,7 @@ 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) { if (argc < 1 || argc > 2) {
wprintw(self->window, "Invalid syntax.\n"); wprintw(self->window, "Invalid syntax.\n");
return; return;
} }
@ -162,22 +162,33 @@ void cmd_add(ToxWindow *self, Tox *m, int argc, char **argv)
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;
char *id; uint8_t *msg;
char *msg;
int i, num; int i, num;
id = argv[1]; char *id = argv[1];
if (id == NULL) {
wprintw(self->window, "Invalid syntax.\n");
return;
}
if (argc == 2) { if (argc == 2) {
if (argv[2][0] != '\"') { msg = argv[2];
if (msg == NULL) {
wprintw(self->window, "Invalid syntax.\n");
return;
}
if (msg[0] != '\"') {
wprintw(self->window, "Messages must be enclosed in quotes.\n"); wprintw(self->window, "Messages must be enclosed in quotes.\n");
return; return;
} }
msg = argv[2];
msg[strlen(++msg)-1] = L'\0'; msg[strlen(++msg)-1] = L'\0';
} else } else
msg = ""; msg = "Let's tox.";
if (strlen(id) != 2 * TOX_FRIEND_ADDRESS_SIZE) { if (strlen(id) != 2 * TOX_FRIEND_ADDRESS_SIZE) {
wprintw(self->window, "Invalid ID length.\n"); wprintw(self->window, "Invalid ID length.\n");
@ -201,7 +212,7 @@ void cmd_add(ToxWindow *self, Tox *m, int argc, char **argv)
id[i] = toupper(id[i]); id[i] = toupper(id[i]);
} }
num = tox_addfriend(m, id_bin, (uint8_t *) msg, strlen(msg) + 1); num = tox_addfriend(m, id_bin, msg, strlen(msg) + 1);
switch (num) { switch (num) {
case TOX_FAERR_TOOLONG: case TOX_FAERR_TOOLONG: