Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debugger: Fix oversight.

Browse Source 
DebugReportGenerator:
- In the case where the function was already disassembled beforehand,
  we weren't retrieving the statement, leading to a null pointer
  dereference.
This commit is contained in:
Rene Gollent 2016-12-11 11:08:17 -05:00
parent 40044981eb
commit c5dcedecae
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kits/debugger/controllers/DebugReportGenerator.cpp
View File

@ -701,10 +701,18 @@ DebugReportGenerator::_DumpFunctionDisassembly(BFile& _output,
} }
codeReference.SetTo(code, true); codeReference.SetTo(code, true);
statement = code->StatementAtAddress(instructionPointer);
} else } else
codeReference.SetTo(code); codeReference.SetTo(code);
statement = code->StatementAtAddress(instructionPointer);
if (statement == NULL) {
data.SetToFormat("\t\t\tUnable to retrieve disassembly for IP %#"
B_PRIx64 ": address does not map to a valid instruction.\n",
instructionPointer);
WRITE_AND_CHECK(_output, data);
return B_OK;
}
SourceLocation location = statement->StartSourceLocation(); SourceLocation location = statement->StartSourceLocation();
data = "\t\t\tDisassembly:\n"; data = "\t\t\tDisassembly:\n";