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

core: Check for attrV being nil before dereference
This commit is contained in:
James Nugent 2016-09-14 15:53:22 +01:00 committed by GitHub
commit 7eea9f2e0e
1 changed files with 3 additions and 1 deletions

View File

@ -638,7 +638,9 @@ func (m schemaMap) diff(
} }
for attrK, attrV := range unsupressedDiff.Attributes { 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 continue
} }