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

Revert "trivial" change of r61772.

Browse Source 
The "slight code simplification" of r61772 broke the code as it could now
crash if dangling m_Cell pointer was used during parsing. Revert it and add a
comment explaining why the code is written in the way it is.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-11-04 16:15:52 +00:00
parent 69cecdb1c4
commit a3873c6f9c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/html/htmlwin.cpp
View File

@@ -468,8 +468,14 @@ bool wxHtmlWindow::DoSetPage(const wxString& source)
SetBackgroundImage(wxNullBitmap); SetBackgroundImage(wxNullBitmap);
m_Parser->SetDC(dc); m_Parser->SetDC(dc);
if (m_Cell)
delete m_Cell; {
delete m_Cell;
// notice that it's important to set m_Cell to NULL here before calling
// Parse() below, even if it will be overwritten by its return value:
// without this we may crash if it's used from inside Parse()
m_Cell = NULL;
}
m_Cell = (wxHtmlContainerCell*) m_Parser->Parse(newsrc); m_Cell = (wxHtmlContainerCell*) m_Parser->Parse(newsrc);
delete dc; delete dc;
m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);