Fix fatal bug in the recently added wxFile::ReadAll().
Make sure we exit the loop when reading the file in chunks in wxFile::ReadAll() and add a unit test for it to ensure that it's really correct. Closes #14725. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -295,7 +295,7 @@ bool wxFile::ReadAll(wxString *str, const wxMBConv& conv)
|
||||
{
|
||||
wxCHECK_MSG( str, false, wxS("Output string must be non-NULL") );
|
||||
|
||||
size_t length = wx_truncate_cast(size_t, Length());
|
||||
ssize_t length = Length();
|
||||
wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );
|
||||
|
||||
wxCharBuffer buf(length);
|
||||
@@ -309,6 +309,10 @@ bool wxFile::ReadAll(wxString *str, const wxMBConv& conv)
|
||||
return false;
|
||||
|
||||
p += nread;
|
||||
if ( length <= nread )
|
||||
break;
|
||||
|
||||
length -= nread;
|
||||
}
|
||||
|
||||
*p = 0;
|
||||
|
Reference in New Issue
Block a user