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

fix for infinite loop in wxFileConfig when reading from input stream fails (patch 837134)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-11-07 11:42:23 +00:00
parent 36ebb50aa3
commit 2825b3f502
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/fileconf.cpp
View File

@@ -494,11 +494,22 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv)
wxString strTmp; wxString strTmp;
char buf[1024]; char buf[1024];
while ( !inStream.Read(buf, WXSIZEOF(buf)).Eof() ) for ( ;; )
strTmp.append(wxConvertMB2WX(buf), inStream.LastRead()); {
inStream.Read(buf, WXSIZEOF(buf));
if ( !inStream.IsOk() )
{
wxLogError(_("Error reading config options."));
break;
}
strTmp.append(wxConvertMB2WX(buf), inStream.LastRead()); strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
if ( inStream.Eof() )
break;
}
strTrans = wxTextBuffer::Translate(strTmp); strTrans = wxTextBuffer::Translate(strTmp);
} }