summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/appl/gssftp/ftp/ChangeLog8
-rw-r--r--src/appl/gssftp/ftp/secure.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index f900c7fd5..9fbe76b12 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,11 @@
+Tue Apr 7 16:53:58 1998 Dan Winship <danw@mit.edu>
+
+ * secure.c (secure_putbyte): Set nout = 0 *before* calling
+ secure_putbuf: if the transfer is aborted, the SIGURG handler will
+ longjmp out, so the line after the secure_putbuf will never get
+ executed, so nout would never be reset and the next transfer
+ would overrun ucbuf.
+
Wed Feb 18 15:29:35 1998 Tom Yu <tlyu@mit.edu>
* Makefile.in: Remove trailing slash from thisconfigdir. Fix up
diff --git a/src/appl/gssftp/ftp/secure.c b/src/appl/gssftp/ftp/secure.c
index a379370eb..cc707ffd3 100644
--- a/src/appl/gssftp/ftp/secure.c
+++ b/src/appl/gssftp/ftp/secure.c
@@ -154,8 +154,8 @@ unsigned char c;
ucbuf[nout++] = c;
if (nout == MAX - FUDGE_FACTOR) {
- ret = secure_putbuf(fd, ucbuf, nout);
nout = 0;
+ ret = secure_putbuf(fd, ucbuf, MAX - FUDGE_FACTOR);
return(ret?ret:c);
}
return (c);