Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug introduced by the last change: we could overwrite the buffer if the file size changed while we were reading it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-05-13 19:40:42 +00:00
parent 143f80756d
commit 2059910d0b
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/textfile.cpp
View File

@@ -127,9 +127,16 @@ bool wxTextFile::OnRead(const wxMBConv& conv)
wxASSERT_MSG( m_file.Tell() == 0, _T("should be at start of file") ); wxASSERT_MSG( m_file.Tell() == 0, _T("should be at start of file") );
char *dst = buf.data(); char *dst = buf.data();
for ( ;; ) for ( size_t nRemaining = bufSize; nRemaining > 0; )
{ {
ssize_t nRead = m_file.Read(dst, BLOCK_SIZE); size_t nToRead = BLOCK_SIZE;
// the file size could have changed, avoid overflowing the buffer
// even if it did
if ( nToRead > nRemaining )
nToRead = nRemaining;
ssize_t nRead = m_file.Read(dst, nToRead);
if ( nRead == wxInvalidOffset ) if ( nRead == wxInvalidOffset )
{ {
@@ -140,10 +147,12 @@ bool wxTextFile::OnRead(const wxMBConv& conv)
if ( nRead == 0 ) if ( nRead == 0 )
{ {
// this file can't be empty because we checked for this above // this file can't be empty because we checked for this above
// so this must be the end of file
break; break;
} }
dst += nRead; dst += nRead;
nRemaining -= nRead;
} }
wxASSERT_MSG( dst - buf.data() == (wxFileOffset)bufSize, wxASSERT_MSG( dst - buf.data() == (wxFileOffset)bufSize,