kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 10:30:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4087 from campoy/fsnode-alias-fix

Browse Source 
Avoid aliasing in fsnode by forcing copies for file contents
This commit is contained in:
Kubernetes Prow Robot
2021-08-04 20:32:56 -07:00
committed by GitHub
parent 1bfe0d08dc 803885049b
commit 54778504ed
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kyaml/filesys/fsnode.go
View File

@@ -123,11 +123,11 @@ func (n *fsNode) addFile(name string, c []byte) (result *fsNode, err error) {
if result.offset != nil { if result.offset != nil {
return nil, fmt.Errorf("cannot add already opened file '%s'", n.Path()) return nil, fmt.Errorf("cannot add already opened file '%s'", n.Path())
} }
result.content = c result.content = append(result.content[:0], c...)
return result, nil return result, nil
} }
result = &fsNode{ result = &fsNode{
content: c, content: append([]byte(nil), c...),
parent: parent, parent: parent,
} }
parent.dir[fileName] = result parent.dir[fileName] = result

6
kyaml/filesys/fsnode_test.go
View File

@@ -157,9 +157,13 @@ func runBasicOperations(
if string(stuff) != both { if string(stuff) != both {
t.Fatalf("%s; unexpected content '%s', expected '%s'", c.what, stuff, both) t.Fatalf("%s; unexpected content '%s', expected '%s'", c.what, stuff, both)
} }
if err := fSys.WriteFile(c.path, []byte(shortContent)); err != nil {
content := []byte(shortContent)
if err := fSys.WriteFile(c.path, content); err != nil {
t.Fatalf("%s; unexpected error: %v", c.what, err) t.Fatalf("%s; unexpected error: %v", c.what, err)
} }
// This ensures that modifying the original slice does not change the contents of the file.
content[0] = '@'
stuff, err = fSys.ReadFile(c.path) stuff, err = fSys.ReadFile(c.path)
if err != nil { if err != nil {
t.Fatalf("%s; unexpected error: %v", c.what, err) t.Fatalf("%s; unexpected error: %v", c.what, err)