Explorar o código

Fix panic when meminfo couldn't be read

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 5f7b1b604c9e44477aee196b17fb4b5692cbbaa6)
Signed-off-by: Tibor Vass <tibor@docker.com>
Brian Goff %!s(int64=9) %!d(string=hai) anos
pai
achega
98b155379b
Modificáronse 1 ficheiros con 1 adicións e 0 borrados
  1. 1 0
      daemon/info.go

+ 1 - 0
daemon/info.go

@@ -51,6 +51,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
 	meminfo, err := system.ReadMemInfo()
 	if err != nil {
 		logrus.Errorf("Could not read system memory info: %v", err)
+		meminfo = &system.MemInfo{}
 	}
 
 	sysInfo := sysinfo.New(true)