andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-25 19:03:30 +04:00
Code Issues Projects Releases Wiki Activity

fix(dap): validate key and index exist when requesting vars (#5628)

Browse Source 
Check if the stack frames contain the thread id and the frame before
trying to get the frame id. If case any of the two fails to be
found, provide the user with messages to inform them of the issue and
gracefully return.

Closes: #5625

Signed-off-by: Filip Dutescu <filip.dutescu@gmail.com>
This commit is contained in:
Filip Dutescu 2023-02-20 06:00:44 +02:00 committed by GitHub
parent e3765ac6d2
commit 44729fbaf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
helix-term/src/commands/dap.rs
View File

@ -475,19 +475,36 @@ pub fn dap_variables(cx: &mut Context) {
if debugger.thread_id.is_none() { if debugger.thread_id.is_none() {
cx.editor cx.editor
.set_status("Cannot access variables while target is running"); .set_status("Cannot access variables while target is running.");
return; return;
} }
let (frame, thread_id) = match (debugger.active_frame, debugger.thread_id) { let (frame, thread_id) = match (debugger.active_frame, debugger.thread_id) {
(Some(frame), Some(thread_id)) => (frame, thread_id), (Some(frame), Some(thread_id)) => (frame, thread_id),
_ => { _ => {
cx.editor cx.editor
.set_status("Cannot find current stack frame to access variables"); .set_status("Cannot find current stack frame to access variables.");
return; return;
} }
}; };
let frame_id = debugger.stack_frames[&thread_id][frame].id; let thread_frame = match debugger.stack_frames.get(&thread_id) {
Some(thread_frame) => thread_frame,
None => {
cx.editor
.set_error("Failed to get stack frame for thread: {thread_id}");
return;
}
};
let stack_frame = match thread_frame.get(frame) {
Some(stack_frame) => stack_frame,
None => {
cx.editor
.set_error("Failed to get stack frame for thread {thread_id} and frame {frame}.");
return;
}
};
let frame_id = stack_frame.id;
let scopes = match block_on(debugger.scopes(frame_id)) { let scopes = match block_on(debugger.scopes(frame_id)) {
Ok(s) => s, Ok(s) => s,
Err(e) => { Err(e) => {