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

fix potential memory leak and move cleanup to the end of the function

Browse Source
This commit is contained in:
Andriy Voskoboinyk 2014-09-04 19:49:50 +03:00
parent 833b724e9f
commit 79bde4e5bf
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/friendlist.c
View File

@ -130,11 +130,12 @@ static int save_blocklist(char *path)
exit_toxic_err("Failed in save_blocklist", FATALERR_MEMORY); exit_toxic_err("Failed in save_blocklist", FATALERR_MEMORY);
int i; int i;
int ret = -1;
int count = 0; int count = 0;
for (i = 0; i < Blocked.max_idx; ++i) { for (i = 0; i < Blocked.max_idx; ++i) {
if (count > Blocked.num_blocked) if (count > Blocked.num_blocked)
return -1; goto on_error;
if (Blocked.list[i].active) { if (Blocked.list[i].active) {
BlockedFriend tmp; BlockedFriend tmp;
@ -155,17 +156,14 @@ static int save_blocklist(char *path)
FILE *fp = fopen(path, "wb"); FILE *fp = fopen(path, "wb");
if (fp == NULL) { if (fp == NULL)
free(data); goto on_error;
return -1;
}
int ret = 0; if (fwrite(data, len, 1, fp) == 1)
ret = 0;
if (fwrite(data, len, 1, fp) != 1)
ret = -1;
fclose(fp); fclose(fp);
on_error:
free(data); free(data);
return ret; return ret;
} }