avoid nil pointer dereference

hashicorp · Feb 3, 2017 · a49759f · a49759f
1 parent 1a6c67d
commit a49759f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/command/agent/config.go b/command/agent/config.go
@@ -898,7 +898,10 @@ func (a *ClientConfig) Merge(b *ClientConfig) *ClientConfig {
 	if b.ClientMinPort != 0 {
 		result.ClientMinPort = b.ClientMinPort
 	}
-	if b.Reserved != nil {
+	if result.Reserved == nil && b.Reserved != nil {
+		reserved := *b.Reserved
+		result.Reserved = &reserved
+	} else if b.Reserved != nil {
 		result.Reserved = result.Reserved.Merge(b.Reserved)
 	}
 	if b.GCInterval != 0 {