1 files changed, 5 insertions, 2 deletions

diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 2a01918..bb15211 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -749,64 +749,69 @@ CFileException e;
                         inAddr=inAddr.Mid(at+1);

                 if((m_Peer.sin_addr.s_addr=inet_addr((LPCTSTR)inAddr))==INADDR_NONE){

                         ASSERT(!m_wndResolver);

                         m_wndResolver = new CResolver(this);

                         ASSERT(m_wndResolver);

                         return m_wndResolver->Resolve();

                 }

                 else

                         OnHostKnown();

         }else{

         tftp::tftpOptions o;

         CString v;

                 if(m_Options.Lookup(tftpoBSize,v)){

                         m__blkSize=atoi(v);

                         if(m__blkSize){

                                 m_blkSize=m__blkSize;

                                 v.Format("%u",m_blkSize);

                                 o[tftpoBSize]=v;

                         }

                 }

                 if(m_Options.Lookup(tftpoTSize,v)){

                         v.Format("%lu",m_xferSize);

                         o[tftpoTSize]=v;

                 }

                 if(m_Options.Lookup(tftpoTOut,v)){

                         m__timeOut=atoi(v);

                         if(m__timeOut){

                                 m_timeOut=m__timeOut;

                                 v.Format("%u",m_timeOut);

                                 o[tftpoTOut]=v;

                         }

                 }

+                // XXX: see if we can enforce our preference regarding block size here.

+                if(m_xferSize >= (m_blkSize<<16)) {

+                        Deny(tftp::errUndefined,IDS_TFTP_ERROR_TOOBIG);

+                        return TRUE;

+                }

                 state = stateXfer;

                 m_ACK=0;

                 if(o.GetCount()){

                 tftp *p = tftp::Allocate(tftp::tftpOACK::tftpSize(&o));

                         ASSERT(p);

                         p->SetOpcode(tftp::opOACK);

                         p->data.m_OACK.Set(&o);

                         PostTFTP(p,TRUE);

                 }else

                         DoXfer();

         }

         return TRUE;

 }

 

 CRRQSocket::CRRQSocket(CPumpKINDlg *daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR_IN *sin)

         : CXferSocket(daddy,fileName,type,sin)

 {

         m_ACK=0;

         m_LastSlack=0;

 }

 

 UINT tftp::tftpERROR::tftpSize(LPCTSTR msg)

 {

         return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpERROR::tftpErrorCode)+strlen(msg)+1;

 }

 

 tftp* tftp::Allocate(UINT tftpSize)

 {

         ASSERT(tftpSize);

 tftp* rv = (tftp*) new BYTE[tftpSlackSize+tftpSize];

         ASSERT(rv);

         rv->length=tftpSize;

@@ -849,69 +854,67 @@ tftp *p = tftp::Allocate(tftp::tftpDATA::tftpSize(m_blkSize));
         TRY{

                 m_File.Seek(m_ACK*m_blkSize,CFile::begin);

         int bytes = m_File.Read(p->data.m_DATA.data,m_blkSize);

                 p->data.m_DATA.SetBlock(m_ACK+1);

                 p->length=p->length-m_blkSize+bytes;

                 m_LastSlack = m_blkSize-bytes;

                 PostTFTP(p);

                 if(bytes<m_blkSize){

                         state=stateClosing; m_ACKtoClose = m_ACK+1;

                 }

         }CATCH(CFileException,e){

                 Deny(e);

         }END_CATCH

 }

 

 UINT tftp::tftpDATA::tftpSize(UINT blkSize)

 {

         return tftpHdrSize-tftpSlackSize+sizeof(tftp::tftpDATA)

                 -sizeof(BYTE)+blkSize;

 }

 

 void CXferSocket::Deny(CFileException* e)

 {

         PostError(e);

         state=stateDeny;

 }

 

 void CXferSocket::PostError(UINT errCode,UINT errID)

 {

 CString msg;

         msg.LoadString(errID);

         ASSERT(m_Daddy);

-        /*// ***

 CString tmp;

         tmp.Format(IDS_LOG_SENTTFTPERROR,errCode,(LPCTSTR)msg);

         m_Daddy->LogLine(tmp);

- */

 tftp* err = tftp::Allocate(tftp::tftpERROR::tftpSize(msg));

 err->SetOpcode(tftp::opERROR);

         err->errSet(errCode,msg);

         PostTFTP(err);

 }

 

 void CXferSocket::PostError(CFileException* e)

 {

 UINT eCode;

 UINT eMsgID;

         switch(e->m_cause){

         case CFileException::fileNotFound:

                 eCode=tftp::errNotFound;

                 eMsgID=IDS_TFTP_ERROR_NOTFOUND;

                 break;

         case CFileException::accessDenied:

                 eCode=tftp::errAccessViolation;

                 eMsgID=IDS_TFTP_ERROR_ACCESS;

                 break;

         case CFileException::directoryFull:

                 eCode=tftp::errDiskFull;

                 eMsgID=IDS_TFTP_ERROR_DIRFULL;

                 break;

         case CFileException::sharingViolation:

                 eCode=tftp::errAccessViolation;

                 eMsgID=IDS_TFTP_ERROR_SHARING;

                 break;

         case CFileException::diskFull:

                 eCode=tftp::errDiskFull;

                 eMsgID=IDS_TFTP_ERROR_DISKFULL;

                 break;

         default: