diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sftp.c | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -18,6 +18,10 @@ | |||
18 | [serverloop.c] | 18 | [serverloop.c] |
19 | memory leaks detected by Coverity via elad AT netbsd.org; | 19 | memory leaks detected by Coverity via elad AT netbsd.org; |
20 | ok deraadt@ dtucker@ | 20 | ok deraadt@ dtucker@ |
21 | - djm@cvs.openbsd.org 2006/03/19 02:22:56 | ||
22 | [sftp.c] | ||
23 | more memory leaks detected by Coverity via elad AT netbsd.org; | ||
24 | deraadt@ ok | ||
21 | 25 | ||
22 | 20060325 | 26 | 20060325 |
23 | - OpenBSD CVS Sync | 27 | - OpenBSD CVS Sync |
@@ -4275,4 +4279,4 @@ | |||
4275 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4279 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4276 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4280 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4277 | 4281 | ||
4278 | $Id: ChangeLog,v 1.4246 2006/03/26 02:51:08 djm Exp $ | 4282 | $Id: ChangeLog,v 1.4247 2006/03/26 02:51:44 djm Exp $ |
@@ -1289,6 +1289,7 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2) | |||
1289 | if (parse_dispatch_command(conn, cmd, &pwd, 1) != 0) { | 1289 | if (parse_dispatch_command(conn, cmd, &pwd, 1) != 0) { |
1290 | xfree(dir); | 1290 | xfree(dir); |
1291 | xfree(pwd); | 1291 | xfree(pwd); |
1292 | xfree(conn); | ||
1292 | return (-1); | 1293 | return (-1); |
1293 | } | 1294 | } |
1294 | } else { | 1295 | } else { |
@@ -1301,6 +1302,7 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2) | |||
1301 | err = parse_dispatch_command(conn, cmd, &pwd, 1); | 1302 | err = parse_dispatch_command(conn, cmd, &pwd, 1); |
1302 | xfree(dir); | 1303 | xfree(dir); |
1303 | xfree(pwd); | 1304 | xfree(pwd); |
1305 | xfree(conn); | ||
1304 | return (err); | 1306 | return (err); |
1305 | } | 1307 | } |
1306 | xfree(dir); | 1308 | xfree(dir); |
@@ -1365,6 +1367,7 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2) | |||
1365 | break; | 1367 | break; |
1366 | } | 1368 | } |
1367 | xfree(pwd); | 1369 | xfree(pwd); |
1370 | xfree(conn); | ||
1368 | 1371 | ||
1369 | #ifdef USE_LIBEDIT | 1372 | #ifdef USE_LIBEDIT |
1370 | if (el != NULL) | 1373 | if (el != NULL) |