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

Fix out of bounds string access in wxMSW wxDirDialog.

Browse Source 
Using the initial directory of "/" (or "\\" or in fact any string consisting
solely of slashes and backslashes) resulted in a crash as the code incorrectly
tried to read the character before the beginning of the string.

Fix this by checking that the string is not empty before using s.end()-1
iterator.

Closes #12946.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-02-19 00:30:32 +00:00
parent ca746004af
commit 359cde15e0
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/msw/dirdlg.cpp
View File

@@ -101,19 +101,17 @@ void wxDirDialog::SetPath(const wxString& path)
// SHBrowseForFolder doesn't like '/'s nor the trailing backslashes // SHBrowseForFolder doesn't like '/'s nor the trailing backslashes
m_path.Replace(wxT("/"), wxT("\\")); m_path.Replace(wxT("/"), wxT("\\"));
if ( !m_path.empty() )
{
while ( *(m_path.end() - 1) == wxT('\\') )
{
m_path.erase(m_path.length() - 1);
}
// but the root drive should have a trailing slash (again, this is just while ( !m_path.empty() && (*(m_path.end() - 1) == wxT('\\')) )
// the way the native dialog works) {
if ( *(m_path.end() - 1) == wxT(':') ) m_path.erase(m_path.length() - 1);
{ }
m_path += wxT('\\');
} // but the root drive should have a trailing slash (again, this is just
// the way the native dialog works)
if ( !m_path.empty() && (*(m_path.end() - 1) == wxT(':')) )
{
m_path += wxT('\\');
} }
} }