internal/pkg: return writer after sync
All checks were successful
Test / Create distribution (push) Successful in 59s
Test / Sandbox (push) Successful in 2m32s
Test / Hakurei (push) Successful in 3m40s
Test / ShareFS (push) Successful in 3m47s
Test / Sandbox (race detector) (push) Successful in 4m52s
Test / Hakurei (race detector) (push) Successful in 3m17s
Test / Flake checks (push) Successful in 1m32s

This fixes a use-after-free.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2026-03-05 00:22:53 +09:00
parent d2c6d486b0
commit 883d4ee4af

View File

@@ -441,14 +441,6 @@ func (a *execArtifact) cure(f *FContext, hostNet bool) (err error) {
}() }()
bw := f.cache.getWriter(status) bw := f.cache.getWriter(status)
defer func() {
flushErr := bw.Flush()
if err == nil {
err = flushErr
}
f.cache.putWriter(bw)
}()
stdoutDone, stderrDone := make(chan struct{}), make(chan struct{}) stdoutDone, stderrDone := make(chan struct{}), make(chan struct{})
go scanVerbose( go scanVerbose(
msg, cancel, stdoutDone, msg, cancel, stdoutDone,
@@ -460,7 +452,17 @@ func (a *execArtifact) cure(f *FContext, hostNet bool) (err error) {
"("+a.name+":2)", "("+a.name+":2)",
io.TeeReader(stderr, bw), io.TeeReader(stderr, bw),
) )
defer func() { <-stdoutDone; <-stderrDone }() defer func() {
<-stdoutDone
<-stderrDone
flushErr := bw.Flush()
if err == nil {
err = flushErr
}
f.cache.putWriter(bw)
}()
} else { } else {
z.Stdout, z.Stderr = status, status z.Stdout, z.Stderr = status, status
} }