Explorar o código

Fix tini version parsing

Invalid version strings for the init (tini)
binary were still accepted, which lead to (e.g.)

"hello world"

Being used as "vhello world"

This makes the version parsing slightly stricter

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn %!s(int64=8) %!d(string=hai) anos
pai
achega
984d99e19c
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      daemon/info_unix.go

+ 1 - 1
daemon/info_unix.go

@@ -69,7 +69,7 @@ func (daemon *Daemon) FillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo)
 				v.InitCommit.Expected = dockerversion.InitCommitID[0:len(v.InitCommit.ID)]
 			}
 		}
-		if v.InitCommit.ID == "" && len(parts) >= 1 {
+		if v.InitCommit.ID == "" && strings.HasPrefix(parts[0], "tini version") {
 			vs := strings.TrimPrefix(parts[0], "tini version ")
 			v.InitCommit.ID = "v" + vs
 		}