tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return a copy of glob lists

Browse source 
Callers to glob methods may do in-place modifications on the returned
list of globs, return a copy instead of the cached value.

Test: m nothing && m nothing
Change-Id: Ic9140d1e1900e8724ba0a484f27786e5c15dea90
This commit is contained in:
Colin Cross 2021-01-21 13:47:59 -08:00
parent 4604a81721
commit a64ca94c0d
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
glob.go
View file

@ -57,7 +57,8 @@ func (c *Context) glob(pattern string, excludes []string) ([]string, error) {
if exists { if exists {
// Glob has already been done, double check it is identical // Glob has already been done, double check it is identical
verifyGlob(fileName, pattern, excludes, g) verifyGlob(fileName, pattern, excludes, g)
return g.Files, nil // Return a copy so that modifications don't affect the cached value.
return append([]string(nil), g.Files...), nil
} }
// Get a globbed file list // Get a globbed file list
@ -76,10 +77,12 @@ func (c *Context) glob(pattern string, excludes []string) ([]string, error) {
// Getting the list raced with another goroutine, throw away the results and use theirs // Getting the list raced with another goroutine, throw away the results and use theirs
if exists { if exists {
verifyGlob(fileName, pattern, excludes, g) verifyGlob(fileName, pattern, excludes, g)
return g.Files, nil // Return a copy so that modifications don't affect the cached value.
return append([]string(nil), g.Files...), nil
} }
return files, nil // Return a copy so that modifications don't affect the cached value.
return append([]string(nil), files...), nil
} }
func (c *Context) Globs() []GlobPath { func (c *Context) Globs() []GlobPath {