idolpx/fsp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some memory leaks

Browse Source
This commit is contained in:
hsn 2003-11-07 19:46:10 +00:00
parent 122b26a889
commit 1b7e49340f
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4,6 +4,8 @@ W.I.P
fspscan: install it when doing make install fspscan: install it when doing make install
fspd: -l logfile switch fspd: -l logfile switch
removed crash when logfile is in use removed crash when logfile is in use
fixed memory leak in client/util.c:get_dir_blk
fixed memory leak in client/util.c:open_dir
Version 2.8.1b15 -- 15 Oct 2003 Version 2.8.1b15 -- 15 Oct 2003
Sven writes manpage for fspscan.1 Sven writes manpage for fspscan.1

28
client/util.c
View File

@ -136,8 +136,10 @@ static RDIRENT **get_dir_blk PROTO1(char *, path)
fpath = util_abs_path(path); fpath = util_abs_path(path);
for(pos = 0, at_eof = acc = cnt = 0; ; ) { for(pos = 0, at_eof = acc = cnt = 0; ; )
while((acc < UBUF_SPACE) && !at_eof) { {
while((acc < UBUF_SPACE) && !at_eof)
{
ub = client_interact(CC_GET_DIR,pos, strlen(fpath), ub = client_interact(CC_GET_DIR,pos, strlen(fpath),
(unsigned char *)fpath+1, 2, (unsigned char *)fpath+1, 2,
(unsigned char *)&client_net_len); (unsigned char *)&client_net_len);
@ -155,7 +157,7 @@ static RDIRENT **get_dir_blk PROTO1(char *, path)
acc += rlen; acc += rlen;
pos += rlen; pos += rlen;
} }
if(acc >= UBUF_SPACE) len = UBUF_SPACE; if(acc >= UBUF_SPACE) len = UBUF_SPACE;
else len = acc; else len = acc;
@ -176,8 +178,8 @@ static RDIRENT **get_dir_blk PROTO1(char *, path)
else dp = (RDIRENT **) malloc((cnt+k+1)*sizeof(RDIRENT *)); else dp = (RDIRENT **) malloc((cnt+k+1)*sizeof(RDIRENT *));
if(!p1 || !dp) { if(!p1 || !dp) {
free(fpath);
fputs("directory reading out of memory\n",stderr); fputs("directory reading out of memory\n",stderr);
free(fpath);
return((RDIRENT **) 0); return((RDIRENT **) 0);
} }
@ -186,6 +188,7 @@ static RDIRENT **get_dir_blk PROTO1(char *, path)
if(((RDIRENT *) p2)->type == RDTYPE_SKIP) break; if(((RDIRENT *) p2)->type == RDTYPE_SKIP) break;
if(((RDIRENT *) p2)->type == RDTYPE_END) { if(((RDIRENT *) p2)->type == RDTYPE_END) {
dp[cnt] = 0; dp[cnt] = 0;
free(fpath);
return(dp); return(dp);
} }
dp[cnt] = (RDIRENT *) p1; dp[cnt] = (RDIRENT *) p1;
@ -201,11 +204,13 @@ static RDIRENT **get_dir_blk PROTO1(char *, path)
if(acc < UBUF_SPACE) { if(acc < UBUF_SPACE) {
dp[cnt] = 0; dp[cnt] = 0;
free(fpath);
return(dp); return(dp);
} }
for(p1 = buf + UBUF_SPACE, p2 = buf, k = (acc -= UBUF_SPACE); k--;) for(p1 = buf + UBUF_SPACE, p2 = buf, k = (acc -= UBUF_SPACE); k--;)
*p2++ = *p1++; *p2++ = *p1++;
} }
free(fpath);
} }
static int util_download_main PROTO5(char *, path, char *, fpath, FILE *, fp, static int util_download_main PROTO5(char *, path, char *, fpath, FILE *, fp,
@ -472,7 +477,11 @@ RDIR *util_opendir PROTO1(char *, path)
if(!strcmp(ddp->path,fpath)) break; if(!strcmp(ddp->path,fpath)) break;
if(!ddp) { if(!ddp) {
if(!(dep = get_dir_blk(fpath))) return((RDIR *) 0); if(!(dep = get_dir_blk(fpath)))
{
free(fpath);
return((RDIR *) 0);
}
ddp = (DDLIST *) malloc(sizeof(DDLIST)); ddp = (DDLIST *) malloc(sizeof(DDLIST));
ddp->dep_root = dep; ddp->dep_root = dep;
ddp->path = fpath; ddp->path = fpath;
@ -546,8 +555,15 @@ int util_stat PROTO2(char *, path, struct stat *, sbuf)
} }
} }
/* free(fpath); */ /* TODO: memory leak is there, this should be freed! */ free(fpath);
fpath = util_abs_path(path); fpath = util_abs_path(path);
if(!strcmp(fpath,env_dir)) {
ppath = fpath;
pfile = ".";
} else {
util_split_path(fpath,&ppath,&p1,&pfile);
}
/* if(cached) printf("Record found in cache.\n",ppath); */ /* if(cached) printf("Record found in cache.\n",ppath); */
if(statworks && !cached) if(statworks && !cached)