jyapayne/code-debug
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash in threadsRequest with no miDebugger, and undefined thread names

Browse source
This commit is contained in:
Leszek Swirski 2018-02-21 11:40:38 +00:00
commit a7b89c3569
3 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/mibase.ts
View file

@ -235,6 +235,8 @@ export class MI2DebugSession extends DebugSession {
Promise.all(all).then(brkpoints => {
let finalBrks = [];
brkpoints.forEach(brkp => {
// TODO: Currently all breakpoints returned are marked as verified,
// which leads to verified breakpoints on a broken lldb.
if (brkp[0])
finalBrks.push(new DebugAdapter.Breakpoint(true, brkp[1].line));
});
@ -256,13 +258,24 @@ export class MI2DebugSession extends DebugSession {
}
protected threadsRequest(response: DebugProtocol.ThreadsResponse): void {
if (!this.miDebugger) {
this.sendResponse(response);
}
this.miDebugger.getThreads().then(
threads => {
response.body = {
threads: []
};
for (const thread of threads) {
response.body.threads.push(new Thread(thread.id, thread.id + ":" + thread.name));
let threadName = thread.name;
// TODO: Thread names are undefined on LLDB
if (threadName === undefined) {
threadName = thread.targetId;
}
if (threadName === undefined) {
threadName = "<unnamed>";
}
response.body.threads.push(new Thread(thread.id, thread.id + ":" + threadName));
}
this.sendResponse(response);
});