summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp-client.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 05592977c..6a755c5f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@
29 - stevesk@cvs.openbsd.org 2002/02/24 16:09:52 29 - stevesk@cvs.openbsd.org 2002/02/24 16:09:52
30 [sshd.c] 30 [sshd.c]
31 use u_char* here; ok markus@ 31 use u_char* here; ok markus@
32 - markus@cvs.openbsd.org 2002/02/24 16:57:19
33 [sftp-client.c]
34 early close(), missing free; ok stevesk@
32 35
3320020225 3620020225
34 - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() 37 - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext()
@@ -7702,4 +7705,4 @@
7702 - Wrote replacements for strlcpy and mkdtemp 7705 - Wrote replacements for strlcpy and mkdtemp
7703 - Released 1.0pre1 7706 - Released 1.0pre1
7704 7707
7705$Id: ChangeLog,v 1.1881 2002/02/26 18:00:48 mouring Exp $ 7708$Id: ChangeLog,v 1.1882 2002/02/26 18:02:43 mouring Exp $
diff --git a/sftp-client.c b/sftp-client.c
index 481341c66..17ac14a95 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -28,7 +28,7 @@
28/* XXX: copy between two remote sites */ 28/* XXX: copy between two remote sites */
29 29
30#include "includes.h" 30#include "includes.h"
31RCSID("$OpenBSD: sftp-client.c,v 1.23 2002/02/13 00:59:23 djm Exp $"); 31RCSID("$OpenBSD: sftp-client.c,v 1.24 2002/02/24 16:57:19 markus Exp $");
32 32
33#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) 33#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
34#include <sys/queue.h> 34#include <sys/queue.h>
@@ -799,7 +799,6 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
799 handle = get_handle(conn->fd_in, id, &handle_len); 799 handle = get_handle(conn->fd_in, id, &handle_len);
800 if (handle == NULL) { 800 if (handle == NULL) {
801 buffer_free(&msg); 801 buffer_free(&msg);
802 close(local_fd);
803 return(-1); 802 return(-1);
804 } 803 }
805 804
@@ -807,6 +806,8 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
807 if (local_fd == -1) { 806 if (local_fd == -1) {
808 error("Couldn't open local file \"%s\" for writing: %s", 807 error("Couldn't open local file \"%s\" for writing: %s",
809 local_path, strerror(errno)); 808 local_path, strerror(errno));
809 buffer_free(&msg);
810 xfree(handle);
810 return(-1); 811 return(-1);
811 } 812 }
812 813