github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-16 05:33:49 +00:00
Code Issues Projects Releases Wiki Activity

proxy: Move defer() higher up

Browse Source 
Pre-existing problem noticed in review.

Signed-off-by: Colin Walters <walters@verbum.org>
This commit is contained in:
Colin Walters 2025-05-16 10:05:49 -04:00
parent 983e77d85f
commit 6ecc6c334f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/skopeo/proxy.go
View File

@ -897,6 +897,15 @@ func (h *proxyHandler) close() {
// send writes a reply buffer to the socket // send writes a reply buffer to the socket
func (buf replyBuf) send(conn *net.UnixConn, err error) error { func (buf replyBuf) send(conn *net.UnixConn, err error) error {
logrus.Debugf("Sending reply: err=%v value=%v pipeid=%v datafd=%v errfd=%v", err, buf.value, buf.pipeid, buf.fd, buf.errfd) logrus.Debugf("Sending reply: err=%v value=%v pipeid=%v datafd=%v errfd=%v", err, buf.value, buf.pipeid, buf.fd, buf.errfd)
// We took ownership of these FDs, so close when we're done sending them or on error
defer func() {
if buf.fd != nil {
buf.fd.Close()
}
if buf.errfd != nil {
buf.errfd.Close()
}
}()
replyToSerialize := reply{ replyToSerialize := reply{
Success: err == nil, Success: err == nil,
Value: buf.value, Value: buf.value,
@ -910,15 +919,6 @@ func (buf replyBuf) send(conn *net.UnixConn, err error) error {
if err != nil { if err != nil {
return err return err
} }
// We took ownership of these FDs, so close when we're done sending them or on error
defer func() {
if buf.fd != nil {
buf.fd.Close()
}
if buf.errfd != nil {
buf.errfd.Close()
}
}()
// Copy the FD number(s) to the socket ancillary buffer // Copy the FD number(s) to the socket ancillary buffer
fds := make([]int, 0) fds := make([]int, 0)
if buf.fd != nil { if buf.fd != nil {