Skip to content

Commit 85a1be8

Browse files
committed
intra: always require client to dup crash fd
1 parent ad792e2 commit 85a1be8

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

intra/tun2socks.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,12 @@ func pipeCrashOutput(c Console) (ok bool) {
317317
log.E("tun: err crash output pipe: %v", err)
318318
return false
319319
}
320-
// core.Close(r) // do not close as r isn't dup'd by client code
320+
defer core.Close(r) // r isn't dup'd by client code
321321
defer core.Close(w) // always close as w is dup'd by the runtime
322322
if setCrashFd(w) && c.CrashFD(int(r.Fd())) {
323323
return true
324324
}
325+
setCrashFd(nil)
325326
return false
326327
}
327328

0 commit comments

Comments
 (0)