mirrors/TegraExplorer
1
0
Fork 0
mirror of https://github.com/suchmememanyskill/TegraExplorer.git synced 2024-09-19 13:33:25 +01:00
Code Issues Releases Activity

Fix memory leakage of getnextloc() and getprevloc()

Browse source
This commit is contained in:
Such Meme, Many Skill 2020-01-04 01:00:11 +01:00
parent e1f4c24686
commit 225a17116c
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
source/tegraexplorer/fs.c
View file

@ -69,7 +69,13 @@ void writeclipboard(const char *in, bool move, bool folder){
} }
char *getnextloc(char *current, char *add){ char *getnextloc(char *current, char *add){
char *ret; static char *ret;
if (ret != NULL){
free(ret);
ret = NULL;
}
size_t size = strlen(current) + strlen(add) + 1; size_t size = strlen(current) + strlen(add) + 1;
ret = (char*) malloc (size); ret = (char*) malloc (size);
if (!strcmp(rootpath, current)) if (!strcmp(rootpath, current))
@ -81,7 +87,14 @@ char *getnextloc(char *current, char *add){
} }
char *getprevloc(char *current){ char *getprevloc(char *current){
char *ret, *temp; static char *ret;
char *temp;
if (ret != NULL){
free(ret);
ret = NULL;
}
size_t size = strlen(current) + 1; size_t size = strlen(current) + 1;
ret = (char*) malloc (size); ret = (char*) malloc (size);
@ -328,8 +341,11 @@ int del_recursive(char *path){
DIR dir; DIR dir;
FILINFO fno; FILINFO fno;
int res; int res;
char *localpath;
localpath = (char*) malloc (strlen(path) + 1);
strcpy(localpath, path);
if ((res = f_opendir(&dir, path))){ if ((res = f_opendir(&dir, localpath))){
char errmes[50] = ""; char errmes[50] = "";
sprintf(errmes, "Error during f_opendir: %d", res); sprintf(errmes, "Error during f_opendir: %d", res);
message(errmes, COLOR_RED); message(errmes, COLOR_RED);
@ -337,24 +353,21 @@ int del_recursive(char *path){
} }
while (!f_readdir(&dir, &fno) && fno.fname[0]){ while (!f_readdir(&dir, &fno) && fno.fname[0]){
/*
if (fno.fattrib & AM_DIR) if (fno.fattrib & AM_DIR)
if ((res = del_recursive(getnextloc(path, fno.fname)))) del_recursive(getnextloc(localpath, fno.fname));
return res;
*/
if (fno.fattrib & AM_DIR)
del_recursive(getnextloc(path, fno.fname));
else if ((res = f_unlink(getnextloc(path, fno.fname)))) else if ((res = f_unlink(getnextloc(localpath, fno.fname))))
return res; return res;
} }
f_closedir(&dir); f_closedir(&dir);
if ((res = f_unlink(path))){ if ((res = f_unlink(localpath))){
return res; return res;
} }
free(localpath);
return 0; return 0;
} }