PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proc: keep debugger state consistent if callInjectionProtocol fails

Browse Source 
pickCurrentThread should always run.
This commit is contained in:
aarzilli 2020-04-22 16:34:48 +02:00 committed by Derek Parker
parent 6102c31d6d
commit bb2525a7d5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/proc/target_exec.go
View File

@ -78,15 +78,19 @@ func (dbp *Target) Continue() error {
threads := dbp.ThreadList() threads := dbp.ThreadList()
callInjectionDone, err := callInjectionProtocol(dbp, threads) callInjectionDone, callErr := callInjectionProtocol(dbp, threads)
if err != nil { // callErr check delayed until after pickCurrentThread, which must always
return err // happen, otherwise the debugger could be left in an inconsistent
} // state.
if err := pickCurrentThread(dbp, trapthread, threads); err != nil { if err := pickCurrentThread(dbp, trapthread, threads); err != nil {
return err return err
} }
if callErr != nil {
return callErr
}
curthread := dbp.CurrentThread() curthread := dbp.CurrentThread()
curbp := curthread.Breakpoint() curbp := curthread.Breakpoint()