From 50d6e75185dd7b2e52a0fdb695ac68b65da701ed Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 3 Jan 2018 15:34:49 -0500 Subject: [PATCH] null checks -- fix Linux crash in drag-dropping files onto app icon? --- src/ModuleManager.cpp | 5 ++++- src/PluginManager.cpp | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ModuleManager.cpp b/src/ModuleManager.cpp index e906067e7..063410e38 100755 --- a/src/ModuleManager.cpp +++ b/src/ModuleManager.cpp @@ -513,7 +513,10 @@ void ModuleManager::FindAllPlugins(PluginIDList & providers, wxArrayString & pat ModuleInterface *module = static_cast(CreateProviderInstance(providerID, modPaths[i])); - + + if (!module) + continue; + wxArrayString newpaths = module->FindPluginPaths(pm); for (size_t i = 0, cnt = newpaths.size(); i < cnt; i++) { diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp index b8929593c..9edc3cec5 100644 --- a/src/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -1759,6 +1759,9 @@ bool PluginManager::DropFile(const wxString &fileName) { auto module = static_cast (mm.CreateProviderInstance(plug->GetID(), plug->GetPath())); + if (! module) + continue; + const auto &ff = module->InstallPath(); auto extensions = module->FileExtensions(); if (!ff.empty() &&