[llvm-branch-commits] [lldb] r182522 - Merging r182441:

[Bill Wendling]

Author: void
Date: Wed May 22 16:25:06 2013
New Revision: 182522

URL: http://llvm.org/viewvc/llvm-project?rev=182522&view=rev
Log:
Merging r182441:
------------------------------------------------------------------------
r182441 | gclayton | 2013-05-21 17:10:28 -0700 (Tue, 21 May 2013) | 5 lines

<rdar://problem/13455021>

Another fix to make sure that if we aren't able to extract an object file for any reason, we don't crash when trying to parse the debug map info.


------------------------------------------------------------------------

Modified:
    lldb/branches/release_33/   (props changed)
    lldb/branches/release_33/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp

Propchange: lldb/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 22 16:25:06 2013
@@ -1,2 +1,2 @@
 /lldb/branches/apple/python-GIL:156467-162159
-/lldb/trunk:182066,182153,182166,182301,182326,182437
+/lldb/trunk:182066,182153,182166,182301,182326,182437,182441

Modified: lldb/branches/release_33/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_33/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp?rev=182522&r1=182521&r2=182522&view=diff
==============================================================================
--- lldb/branches/release_33/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp (original)
+++ lldb/branches/release_33/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp Wed May 22 16:25:06 2013
@@ -54,6 +54,8 @@ SymbolFileDWARFDebugMap::CompileUnitInfo
         return file_range_map;
     
     ObjectFile *oso_objfile = oso_module->GetObjectFile();
+    if (!oso_objfile)
+        return file_range_map;
     
     Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_MAP));
     if (log)