Merge pull request #8834 from hashicorp/b-diff-suppress-empty

core: Check for attrV being nil before dereference
hashicorp · Sep 14, 2016 · 7eea9f2 · 7eea9f2
2 parents 6a84704 + e0226c9
commit 7eea9f2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/helper/schema/schema.go b/helper/schema/schema.go
@@ -638,7 +638,9 @@ func (m schemaMap) diff(
 	}
 
 	for attrK, attrV := range unsupressedDiff.Attributes {
-		if schema.DiffSuppressFunc != nil && schema.DiffSuppressFunc(attrK, attrV.Old, attrV.New, d) {
+		if schema.DiffSuppressFunc != nil &&
+			attrV != nil &&
+			schema.DiffSuppressFunc(attrK, attrV.Old, attrV.New, d) {
 			continue
 		}