1 files changed, 6 insertions, 0 deletions
diff --git a/lib/DebugInfo/DWARFContext.cpp b/lib/DebugInfo/DWARFContext.cpp
index 5fd4280ba7..4fc0b301be 100644
--- a/lib/DebugInfo/DWARFContext.cpp
+++ b/lib/DebugInfo/DWARFContext.cpp
@@ -147,13 +147,19 @@ DILineInfo DWARFContext::getLineInfoForAddress(uint64_t address) {
   uint32_t cuOffset = getDebugAranges()->offsetAtIndex(arangeIndex);
   // Retrieve the compile unit.
   DWARFCompileUnit *cu = getCompileUnitForOffset(cuOffset);
+  if (!cu)
+    return DILineInfo("<invalid>", 0, 0);
   // Get the line table for this compile unit.
   const DWARFDebugLine::LineTable *lineTable = getLineTableForCompileUnit(cu);
+  if (!lineTable)
+    return DILineInfo("<invalid>", 0, 0);
   // Get the index of the row we're looking for in the line table.
   uint64_t hiPC =
     cu->getCompileUnitDIE()->getAttributeValueAsUnsigned(cu, DW_AT_high_pc,
                                                          -1ULL);
   uint32_t rowIndex = lineTable->lookupAddress(address, hiPC);
+  if (rowIndex == -1U)
+    return DILineInfo("<invalid>", 0, 0);
 
   // From here, contruct the DILineInfo.
   const DWARFDebugLine::Row &row = lineTable->Rows[rowIndex];