ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19587 from hashicorp/jbardin/safe-appends 

don't modify argument slices
This commit is contained in:
James Bardin 2018-12-10 15:10:02 -05:00 committed by GitHub
parent ecc93c9889 b5de50c0a2
commit 8ab5698e2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
helper/schema/field_reader_diff.go
View File

@ -174,6 +174,9 @@ func (r *DiffFieldReader) readPrimitive(
func (r *DiffFieldReader) readSet( func (r *DiffFieldReader) readSet(
address []string, schema *Schema) (FieldReadResult, error) { address []string, schema *Schema) (FieldReadResult, error) {
// copy address to ensure we don't modify the argument
address = append([]string(nil), address...)
prefix := strings.Join(address, ".") + "." prefix := strings.Join(address, ".") + "."
// Create the set that will be our result // Create the set that will be our result

3
helper/schema/field_reader_map.go
View File

@ -98,6 +98,9 @@ func (r *MapFieldReader) readPrimitive(
func (r *MapFieldReader) readSet( func (r *MapFieldReader) readSet(
address []string, schema *Schema) (FieldReadResult, error) { address []string, schema *Schema) (FieldReadResult, error) {
// copy address to ensure we don't modify the argument
address = append([]string(nil), address...)
// Get the number of elements in the list // Get the number of elements in the list
countRaw, err := r.readPrimitive( countRaw, err := r.readPrimitive(
append(address, "#"), &Schema{Type: TypeInt}) append(address, "#"), &Schema{Type: TypeInt})