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

Don't crash when input is empty in wxFileConfig(wxInputStream) ctor.

Browse Source 
Fix crash due to dereferencing a NULL pointer when the input buffer in
wxFileConfig ctor is empty.

Closes #11636.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-01-23 13:22:14 +00:00
parent 03cc29918f
commit 975fb32b5c
3 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/common/fileconf.cpp
View File

@@ -469,33 +469,36 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, const wxMBConv& conv)
cbuf = wxCharBuffer::CreateNonOwned((char *)buf.GetData(), buf.GetDataLen());
#endif // wxUSE_UNICODE/!wxUSE_UNICODE
// now break it into lines
wxMemoryText memText;
for ( const wxChar *s = cbuf; ; ++s )
// parse the input contents if there is anything to parse
if ( cbuf )
{
const wxChar *e = s;
while ( *e != '\0' && *e != '\n' && *e != '\r' )
++e;
// now break it into lines
wxMemoryText memText;
for ( const wxChar *s = cbuf; ; ++s )
{
const wxChar *e = s;
while ( *e != '\0' && *e != '\n' && *e != '\r' )
++e;
// notice that we throw away the original EOL kind here, maybe we
// should preserve it?
if ( e != s )
memText.AddLine(wxString(s, e));
// notice that we throw away the original EOL kind here, maybe we
// should preserve it?
if ( e != s )
memText.AddLine(wxString(s, e));
if ( *e == '\0' )
break;
if ( *e == '\0' )
break;
// skip the second EOL byte if it's a DOS one
if ( *e == '\r' && e[1] == '\n' )
++e;
// skip the second EOL byte if it's a DOS one
if ( *e == '\r' && e[1] == '\n' )
++e;
s = e;
s = e;
}
// Finally we can parse it all.
Parse(memText, true /* local */);
}
// Finally we can parse it all.
Parse(memText, true /* local */);
SetRootPath();
ResetDirty();
}