Merge pull request #1130 from sunshineplan/master

shirou · web-flow · commit ce5729cbcdf6 · 2021-09-11T11:11:55.000+09:00
v3/process (Win): fix Kill() DuplicateHandle error
diff --git a/v3/process/process_windows.go b/v3/process/process_windows.go
@@ -650,7 +650,10 @@ func (p *Process) TerminateWithContext(ctx context.Context) error {
 }
 
 func (p *Process) KillWithContext(ctx context.Context) error {
-	process := os.Process{Pid: int(p.Pid)}
+	process, err := os.FindProcess(int(p.Pid))
+	if err != nil {
+		return err
+	}
 	return process.Kill()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -650,7 +650,10 @@ func (p *Process) TerminateWithContext(ctx context.Context) error {`
`650`	`650`	`}`
`651`	`651`
`652`	`652`	`func (p *Process) KillWithContext(ctx context.Context) error {`
`653`		`- process := os.Process{Pid: int(p.Pid)}`
	`653`	`+ process, err := os.FindProcess(int(p.Pid))`
	`654`	`+ if err != nil {`
	`655`	`+ return err`
	`656`	`+ }`
`654`	`657`	`return process.Kill()`
`655`	`658`	`}`
`656`	`659`