2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e6b71615c..f5e6dab35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
      exit instead of doing a blocking tcp send if we detect a client/server
      timeout, since the tcp sendqueue might be already full (of alive
      requests); ok dtucker, report mpf
+   - djm@cvs.openbsd.org 2006/10/22 02:25:50
+     [sftp-client.c]
+     cancel progress meter when upload write fails; ok deraadt@
 
 20061018
  - (dtucker) OpenBSD CVS Sync
@@ -2563,4 +2566,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4577 2006/10/23 17:02:41 djm Exp $
+$Id: ChangeLog,v 1.4578 2006/10/23 17:03:02 djm Exp $
diff --git a/sftp-client.c b/sftp-client.c
index e31b2cfaf..42eb2b41b 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.74 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.75 2006/10/22 02:25:50 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1134,6 +1134,8 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
                         if (status != SSH2_FX_OK) {
                                 error("Couldn't write to remote file \"%s\": %s",
                                     remote_path, fx2txt(status));
+                                if (showprogress)
+                                        stop_progress_meter();
                                 do_close(conn, handle, handle_len);
                                 close(local_fd);
                                 xfree(data);