Avoid panic in s3 list operation (#2785)

hashicorp · Jun 5, 2017 · a337f9f · a337f9f
1 parent 83ecd0f
commit a337f9f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/physical/s3.go b/physical/s3.go
@@ -214,6 +214,11 @@ func (s *S3Backend) List(prefix string) ([]string, error) {
 	err := s.client.ListObjectsV2Pages(params,
 		func(page *s3.ListObjectsV2Output, lastPage bool) bool {
 			for _, key := range page.Contents {
+				// Avoid panic
+				if key == nil {
+					continue
+				}
+
 				key := strings.TrimPrefix(*key.Key, prefix)
 
 				if i := strings.Index(key, "/"); i == -1 {