Merge pull request #2545 from coryb/umask-git-panic

fix panic from umask-git on invalid ref
moby · Jan 4, 2022 · 1725efc · 1725efc
2 parents a8278dd + 397c98b
commit 1725efc
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/source/git/gitsource_unix.go b/source/git/gitsource_unix.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"syscall"
 	"time"
 
 	"github.com/docker/docker/pkg/reexec"
@@ -63,8 +64,12 @@ func gitMain() {
 	close(done)
 	if err != nil {
 		if exiterr, ok := err.(*exec.ExitError); ok {
-			status := exiterr.Sys().(unix.WaitStatus)
-			os.Exit(status.ExitStatus())
+			switch status := exiterr.Sys().(type) {
+			case unix.WaitStatus:
+				os.Exit(status.ExitStatus())
+			case syscall.WaitStatus:
+				os.Exit(status.ExitStatus())
+			}
 		}
 		os.Exit(1)
 	}