Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix SIGSEGV on file system deletion while building #765

Merged
merged 2 commits into from
Sep 25, 2019
Merged

Fix SIGSEGV on file system deletion while building #765

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1cc42b
Fix https://github.com/GoogleContainerTools/kaniko/issues/756
Sep 9, 2019
a21129f
Fix typo and run go fmt over fs_util
Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions pkg/util/fs_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ func DeleteFilesystem() error {
logrus.Info("Deleting filesystem...")
return filepath.Walk(constants.RootDir, func(path string, info os.FileInfo, _ error) error {
if CheckWhitelist(path) {
if ! isExist(path) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be run through gofmt to get travis to pass

logrus.Debugf("Path %s whitelisted, but not exists", path)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: double space after Path

return nil
}
if info.IsDir() {
return filepath.SkipDir
}
Expand All @@ -137,6 +141,13 @@ func DeleteFilesystem() error {
return os.RemoveAll(path)
})
}
// isExists returns tru if path exists
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: true

func isExist(path string) bool {
if _, err := os.Stat(path); err == nil {
return true
}
return false
}

// ChildDirInWhitelist returns true if there is a child file or directory of the path in the whitelist
func childDirInWhitelist(path string) bool {
Expand Down