浏览代码

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 8 年之前
父节点
当前提交
984d99e19c
共有 1 个文件被更改,包括 1 次插入1 次删除
  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)]
 				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 ")
 			vs := strings.TrimPrefix(parts[0], "tini version ")
 			v.InitCommit.ID = "v" + vs
 			v.InitCommit.ID = "v" + vs
 		}
 		}