Re: [lmi] Reproducible html help crash

[Vaclav Slavik]

Greg Chicares wrote:
> Symptoms: If I run lmi under gdb, I get a reproducible segfault
> (see backtrace below [1]). If I run with the "drmingw" JIT
> debugger enabled, I get
>     lmi_wx_shared.exe caused an Access Violation at location
>     77de6439 in module ADVAPI32.DLL
>     Reading from location 0671b1fc.

Fixed here: http://svn.wxwidgets.org/viewvc/wx?view=rev&revision=52470

I can't find a way to make ViewVC show patch for the entire
changeset if it spans multiple files, so here's the patch:


Index: src/html/helpwnd.cpp
===================================================================
--- src/html/helpwnd.cpp        (revision 52469)
+++ src/html/helpwnd.cpp        (revision 52470)
@@ -592,6 +592,9 @@
 
 wxHtmlHelpWindow::~wxHtmlHelpWindow()
 {
+    if ( m_helpController )
+        m_helpController->SetHelpWindow(NULL);
+
     delete m_mergedIndex;
 
     // PopEventHandler(); // wxhtmlhelpcontroller (not any more!)
Index: src/html/helpctrl.cpp
===================================================================
--- src/html/helpctrl.cpp       (revision 52469)
+++ src/html/helpctrl.cpp       (revision 52470)
@@ -87,12 +87,13 @@
 {
     if (m_Config)
         WriteCustomization(m_Config, m_ConfigRoot);
-    
+
     evt.Skip();
 
     OnQuit();
 
-    m_helpWindow->SetController(NULL);
+    if ( m_helpWindow )
+        m_helpWindow->SetController(NULL);
     m_helpWindow = NULL;
     m_helpDialog = NULL;
     m_helpFrame = NULL;
Index: src/html/helpfrm.cpp
===================================================================
--- src/html/helpfrm.cpp        (revision 52469)
+++ src/html/helpfrm.cpp        (revision 52470)
@@ -90,6 +90,7 @@
                              wxConfigBase *config, const wxString& rootpath)
 {
     m_HtmlHelpWin = new wxHtmlHelpWindow(m_Data);
+    m_HtmlHelpWin->SetController(m_helpController);
     if ( config)
         m_HtmlHelpWin->UseConfig(config, rootpath);
     


Vaclav

-- 
PGP key: 0x465264C9, available from http://pgp.mit.edu/