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

Fix for another segfault/leak case when using -f arg

Browse Source
This commit is contained in:
naxuroqa 2013-08-14 19:21:36 +02:00
parent 9cabdaa6a0
commit cab4d43889
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main.c
View File

@ -196,17 +196,8 @@ static void load_data(Messenger *m, char *path)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char *user_config_dir = get_user_config_dir(); char *user_config_dir = get_user_config_dir();
char *DATA_FILE; char *DATA_FILE = NULL;
int config_err = create_user_config_dir(user_config_dir); int config_err = 0;
if(config_err) {
DATA_FILE = "data";
} else {
DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
strcpy(DATA_FILE, user_config_dir);
strcat(DATA_FILE, CONFIGDIR);
strcat(DATA_FILE, "data");
}
free(user_config_dir);
/* This is broken */ /* This is broken */
int f_loadfromfile = 1; int f_loadfromfile = 1;
@ -227,6 +218,19 @@ int main(int argc, char *argv[])
} }
} }
if (DATA_FILE == NULL ) {
config_err = create_user_config_dir(user_config_dir);
if (config_err) {
DATA_FILE = strdup("data");
} else {
DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
strcpy(DATA_FILE, user_config_dir);
strcat(DATA_FILE, CONFIGDIR);
strcat(DATA_FILE, "data");
}
}
free(user_config_dir);
init_term(); init_term();
Messenger *m = init_tox(); Messenger *m = init_tox();
ToxWindow * prompt = init_windows(m); ToxWindow * prompt = init_windows(m);