containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1984 from giuseppe/followup-pr 

overlay: check for options != nil
This commit is contained in:
openshift-merge-bot[bot] 2024-06-21 16:22:22 +00:00 committed by GitHub
parent 11705cab82 2faa9cf451
commit 9a0bef07c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/overlay/overlay.go
View File

@ -2162,10 +2162,11 @@ func supportsDataOnlyLayersCached(home, runhome string) (bool, error) {
// ApplyDiffWithDiffer applies the changes in the new layer using the specified function // ApplyDiffWithDiffer applies the changes in the new layer using the specified function
func (d *Driver) ApplyDiffWithDiffer(id, parent string, options *graphdriver.ApplyDiffWithDifferOpts, differ graphdriver.Differ) (output graphdriver.DriverWithDifferOutput, errRet error) { func (d *Driver) ApplyDiffWithDiffer(id, parent string, options *graphdriver.ApplyDiffWithDifferOpts, differ graphdriver.Differ) (output graphdriver.DriverWithDifferOutput, errRet error) {
var idMappings *idtools.IDMappings var idMappings *idtools.IDMappings
forceMask := options.ForceMask var forceMask *os.FileMode
if options != nil { if options != nil {
idMappings = options.Mappings idMappings = options.Mappings
forceMask = options.ForceMask
} }
if d.options.forceMask != nil { if d.options.forceMask != nil {
forceMask = d.options.forceMask forceMask = d.options.forceMask