From: Dan Winship Date: Tue, 7 Apr 1998 21:02:02 +0000 (+0000) Subject: * secure.c (secure_putbyte): Set nout = 0 *before* calling X-Git-Tag: krb5-1.1-beta1~755 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=196d49f424c4606b98c7e366d3ae74c8d9b6040d;p=krb5.git * 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. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10524 dc483132-0cff-0310-8789-dd5450dbe970 --- 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 + + * 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 * 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);