nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix major memory leak in sftp_cmd_ls (thanks to Hans-Juergen Petrich

Browse Source 
for pointing it out).

[originally from svn r1612]
This commit is contained in:
Simon Tatham 2002-03-31 16:26:13 +00:00
parent 01ca464ad2
commit ae2599845c
3 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
psftp.c
View File

@ -188,15 +188,15 @@ int sftp_cmd_quit(struct sftp_command *cmd)
*/ */
static int sftp_ls_compare(const void *av, const void *bv) static int sftp_ls_compare(const void *av, const void *bv)
{ {
const struct fxp_name *a = (const struct fxp_name *) av; const struct fxp_name *const *a = (const struct fxp_name *const *) av;
const struct fxp_name *b = (const struct fxp_name *) bv; const struct fxp_name *const *b = (const struct fxp_name *const *) bv;
return strcmp(a->filename, b->filename); return strcmp((*a)->filename, (*b)->filename);
} }
int sftp_cmd_ls(struct sftp_command *cmd) int sftp_cmd_ls(struct sftp_command *cmd)
{ {
struct fxp_handle *dirh; struct fxp_handle *dirh;
struct fxp_names *names; struct fxp_names *names;
struct fxp_name *ournames; struct fxp_name **ournames;
int nnames, namesize; int nnames, namesize;
char *dir, *cdir; char *dir, *cdir;
int i; int i;
@ -247,9 +247,8 @@ int sftp_cmd_ls(struct sftp_command *cmd)
} }
for (i = 0; i < names->nnames; i++) for (i = 0; i < names->nnames; i++)
ournames[nnames++] = names->names[i]; ournames[nnames++] = fxp_dup_name(&names->names[i]);
names->nnames = 0; /* prevent free_names */
fxp_free_names(names); fxp_free_names(names);
} }
fxp_close(dirh); fxp_close(dirh);
@ -263,8 +262,11 @@ int sftp_cmd_ls(struct sftp_command *cmd)
/* /*
* And print them. * And print them.
*/ */
for (i = 0; i < nnames; i++) for (i = 0; i < nnames; i++) {
printf("%s\n", ournames[i].longname); printf("%s\n", ournames[i]->longname);
fxp_free_name(ournames[i]);
}
sfree(ournames);
} }
sfree(cdir); sfree(cdir);

25
sftp.c
View File

@ -923,3 +923,28 @@ void fxp_free_names(struct fxp_names *names)
sfree(names->names); sfree(names->names);
sfree(names); sfree(names);
} }
/*
* Duplicate an fxp_name structure.
*/
struct fxp_name *fxp_dup_name(struct fxp_name *name)
{
struct fxp_name *ret;
ret = smalloc(sizeof(struct fxp_name));
ret->filename = dupstr(name->filename);
ret->longname = dupstr(name->longname);
ret->attrs = name->attrs; /* structure copy */
return ret;
}
/*
* Free up an fxp_name structure.
*/
void fxp_free_name(struct fxp_name *name)
{
int i;
sfree(name->filename);
sfree(name->longname);
sfree(name);
}

6
sftp.h
View File

@ -174,3 +174,9 @@ struct fxp_names *fxp_readdir(struct fxp_handle *handle);
* Free up an fxp_names structure. * Free up an fxp_names structure.
*/ */
void fxp_free_names(struct fxp_names *names); void fxp_free_names(struct fxp_names *names);
/*
* Duplicate and free fxp_name structures.
*/
struct fxp_name *fxp_dup_name(struct fxp_name *name);
void fxp_free_name(struct fxp_name *name);