From 0f60be60a2a24feb3a89a9ea0fade60a3d88a7e7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 29 Aug 2014 11:56:33 +0000 Subject: [PATCH] Don't leave wxHtmlWinParser with a dangling wxDC pointer. Call SetDC(NULL) to prevent wxHtmlWinParser from using a pointer to the already destroyed wxDC object. See #16501. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/htmlwin.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 1aae3788f4..e1bae28e2c 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -495,6 +495,10 @@ bool wxHtmlWindow::DoSetPage(const wxString& source) m_Cell = (wxHtmlContainerCell*) m_Parser->Parse(newsrc); + // The parser doesn't need the DC any more, so ensure it's not left with a + // dangling pointer after the DC object goes out of scope. + m_Parser->SetDC(NULL); + m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); m_Cell->SetAlignHor(wxHTML_ALIGN_CENTER); CreateLayout();