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

Fix minor memory leak in psftp batch mode.

Browse Source 
Spotted by Leak Sanitiser, while I was investigating the PSFTP /
proftpd issue mentioned in the previous commit (with ASan on as
usual).

The two very similar loops that read PSFTP commands from the
interactive prompt and a batch file differed in one respect: only one
of them remembered to free the command afterwards. Now I've moved the
freeing code out into a subroutine that both loops can use.

(cherry picked from commit bf0f323fb4)
This commit is contained in:
Simon Tatham 2020-02-05 19:45:27 +00:00
parent aed81648cc
commit 67ca9703be
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
psftp.c
View File

@ -2316,6 +2316,16 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags)
return cmd; return cmd;
} }
static void sftp_cmd_free(struct sftp_command *cmd)
{
if (cmd->words) {
for (size_t i = 0; i < cmd->nwords; i++)
sfree(cmd->words[i]);
sfree(cmd->words);
}
sfree(cmd);
}
static int do_sftp_init(void) static int do_sftp_init(void)
{ {
struct sftp_packet *pktin; struct sftp_packet *pktin;
@ -2390,13 +2400,7 @@ int do_sftp(int mode, int modeflags, char *batchfile)
if (!cmd) if (!cmd)
break; break;
ret = cmd->obey(cmd); ret = cmd->obey(cmd);
if (cmd->words) { sftp_cmd_free(cmd);
int i;
for(i = 0; i < cmd->nwords; i++)
sfree(cmd->words[i]);
sfree(cmd->words);
}
sfree(cmd);
if (ret < 0) if (ret < 0)
break; break;
} }
@ -2413,6 +2417,7 @@ int do_sftp(int mode, int modeflags, char *batchfile)
if (!cmd) if (!cmd)
break; break;
ret = cmd->obey(cmd); ret = cmd->obey(cmd);
sftp_cmd_free(cmd);
if (ret < 0) if (ret < 0)
break; break;
if (ret == 0) { if (ret == 0) {