From: Sam Hartman Date: Wed, 20 Nov 1996 23:00:07 +0000 (+0000) Subject: Apply patch from shadow@andrew.cmu.edu to fix a bug I fixed X-Git-Tag: krb5-1.1-beta1~1429 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=35f35d74f3d5515f9b21444af0b9791ada087e16;p=krb5.git Apply patch from shadow@andrew.cmu.edu to fix a bug I fixed for krb5 if compiled with Kerberos support; we don't support that, but applying the patch was easier than removing the code. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9445 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog index 9224e5dd8..3262141e9 100644 --- a/src/appl/gssftp/ftp/ChangeLog +++ b/src/appl/gssftp/ftp/ChangeLog @@ -3,10 +3,17 @@ Fri Sep 27 16:05:09 1996 Tom Yu * cmds.c (setpeer): Apply jik's fix so "-n" actually works as intended. + Tue Sep 10 14:07:15 1996 Tom Yu * ftp.M: remove ".so man1/header.doc" +Fri Aug 16 20:04:03 1996 Sam Hartman + + * secure.c (nbyte;): Fix for Kerberos IV version of the memory + allocation bug I fixed for Kerberos V; you want nbyte + + FUDGE_FACTOR, not out_buff.length. + Tue Jul 30 19:45:45 1996 Samuel D Hartman (hartmans@vorlon) * ftp.c (empt resety): Use fd_set as a typedef not a struct. diff --git a/src/appl/gssftp/ftp/secure.c b/src/appl/gssftp/ftp/secure.c index 183f10a3a..550160b03 100644 --- a/src/appl/gssftp/ftp/secure.c +++ b/src/appl/gssftp/ftp/secure.c @@ -234,7 +234,7 @@ unsigned int nbyte; if (outbuf? (outbuf = realloc(outbuf, (unsigned) (nbyte + FUDGE_FACTOR))): (outbuf = malloc((unsigned) (nbyte + FUDGE_FACTOR)))) { - bufsize = out_buf.length; + bufsize =nbyte + FUDGE_FACTOR; } else { bufsize = 0; secure_error("%s (in malloc of PROT buffer)",