From 0b3fe5544266b6f9657ecd87989b85b535cc63e1 Mon Sep 17 00:00:00 2001
From: Alexandr Morozov <lk4d4math@gmail.com>
Date: Thu, 5 Jun 2014 10:49:40 +0400
Subject: [PATCH] Fix race in contStore.List

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
---
 daemon/daemon.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/daemon/daemon.go b/daemon/daemon.go
index 7aa308782f..a766c8991b 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -72,9 +72,11 @@ func (c *contStore) Delete(id string) {
 
 func (c *contStore) List() []*Container {
 	containers := new(History)
+	c.Lock()
 	for _, cont := range c.s {
 		containers.Add(cont)
 	}
+	c.Unlock()
 	containers.Sort()
 	return *containers
 }