Merge pull request #1243 from KLayout/issue-1242

Fixed issue #1242 (KLayout 0.28.2 crashes when registering a plugin i…

src/laybasic/laybasic/layLayoutViewBase.cc

@@ -578,10 +578,11 @@ void LayoutViewBase::drop_url (const std::string &path_or_url)
 
 void LayoutViewBase::clear_plugins ()
 {
-  for (std::vector<lay::Plugin *>::iterator p = mp_plugins.begin (); p != mp_plugins.end (); ++p) {
+  std::vector<lay::Plugin *> plugins;
+  mp_plugins.swap (plugins);
+  for (std::vector<lay::Plugin *>::iterator p = plugins.begin (); p != plugins.end (); ++p) {
     delete *p;
   }
-  mp_plugins.clear ();
   mp_active_plugin = 0;
 }
 

src/layview/layview/layLayoutView_qt.cc

@@ -98,15 +98,23 @@ namespace lay
 //  LayoutViewWidget implementation
 
 LayoutViewWidget::LayoutViewWidget (db::Manager *mgr, bool editable, lay::Plugin *plugin_parent, QWidget *parent, unsigned int options)
-  : QFrame (parent)
+  : QFrame (parent), mp_view (0)
 {
-  mp_view = new LayoutView (mgr, editable, plugin_parent, this, options);
+  //  NOTE: construction the LayoutView may trigger events (script code executed etc.) which must
+  //  not meet an invalid mp_view pointer (e.g. in eventFilter). Hence, mp_view is 0 first, and set only
+  //  after the LayoutView is successfully constructed.
+  std::unique_ptr<LayoutView> view (new LayoutView (mgr, editable, plugin_parent, this, options));
+  mp_view = view.release ();
 }
 
 LayoutViewWidget::LayoutViewWidget (lay::LayoutView *source, db::Manager *mgr, bool editable, lay::Plugin *plugin_parent, QWidget *parent, unsigned int options)
-  : QFrame (parent)
+  : QFrame (parent), mp_view (0)
 {
-  mp_view = new LayoutView (source, mgr, editable, plugin_parent, this, options);
+  //  NOTE: construction the LayoutView may trigger events (script code executed etc.) which must
+  //  not meet an invalid mp_view pointer (e.g. in eventFilter). Hence, mp_view is 0 first, and set only
+  //  after the LayoutView is successfully constructed.
+  std::unique_ptr<LayoutView> view (new LayoutView (source, mgr, editable, plugin_parent, this, options));
+  mp_view = view.release ();
 }
 
 LayoutViewWidget::~LayoutViewWidget ()

testdata/ruby/layLayoutView.rb

@@ -498,6 +498,39 @@ class LAYLayoutView_TestClass < TestBase
 
   end
 
+  class DummyPlugin < RBA::Plugin
+    def initialize(manager, view)
+      self.manager = manager
+      self.view = view
+    end
+  end
+
+  class DummyPluginFactory < RBA::PluginFactory
+    def initialize()
+      register(1000, "dummy_plugin", "Dummy Plugin")
+    end
+    def create_plugin(manager, unused, view)
+      DummyPlugin::new(manager, view)
+    end
+  end
+
+  # issue-1242
+  def test_6
+
+    # Create a new layout
+    main_window = RBA::MainWindow.instance()
+    main_window.close_all
+    main_window.create_layout(2)
+
+    # Register plugin -> crashes in issue-1242
+    dpi = DummyPluginFactory::new
+
+    main_window.close_all
+
+    dpi._destroy
+
+  end
+
 end
 
 load("test_epilogue.rb")