[Lldb-commits] [lldb] r157653 - in /lldb/trunk/source: Core/SearchFilter.cpp Plugins/Platform/MacOSX/PlatformDarwin.cpp

[Jim Ingham]

Author: jingham
Date: Tue May 29 18:48:51 2012
New Revision: 157653

URL: http://llvm.org/viewvc/llvm-project?rev=157653&view=rev
Log:
Check for NULL modules coming into the SearchFilter's ModulePasses & PlatformDarwin::ModuleIsExcludedForNonModuleSpecificSearches functions.

Modified:
    lldb/trunk/source/Core/SearchFilter.cpp
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp

Modified: lldb/trunk/source/Core/SearchFilter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/SearchFilter.cpp?rev=157653&r1=157652&r2=157653&view=diff
==============================================================================
--- lldb/trunk/source/Core/SearchFilter.cpp (original)
+++ lldb/trunk/source/Core/SearchFilter.cpp Tue May 29 18:48:51 2012
@@ -305,7 +305,9 @@
     bool
     SearchFilterForNonModuleSpecificSearches::ModulePasses (const lldb::ModuleSP &module_sp)
     {
-        if (m_target_sp->ModuleIsExcludedForNonModuleSpecificSearches (module_sp))
+        if (!module_sp)
+            return true;
+        else if (m_target_sp->ModuleIsExcludedForNonModuleSpecificSearches (module_sp))
             return false;
         else
             return true;

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp?rev=157653&r1=157652&r2=157653&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp Tue May 29 18:48:51 2012
@@ -563,6 +563,9 @@
 bool
 PlatformDarwin::ModuleIsExcludedForNonModuleSpecificSearches (lldb_private::Target &target, const lldb::ModuleSP &module_sp)
 {
+    if (!module_sp)
+        return false;
+        
     ObjectFile *obj_file = module_sp->GetObjectFile();
     if (!obj_file)
         return false;