particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disk: guard against nil pointer dereferencing

Browse source 
Add guards protecting against dereferencing the pointer receiver of
method calls.

Co-Authored-By: Achilleas Koutsou <achilleas@koutsou.net>
This commit is contained in:
Christian Kellner 2022-02-19 13:28:40 +01:00 • committed by Tom Gundersen
parent beaf411628
commit 206e030f2c
6 changed files with 51 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/disk/btrfs.go
View file

@ -105,6 +105,9 @@ func (bs *BtrfsSubvolume) Clone() Entity {
}
func (bs *BtrfsSubvolume) GetSize() uint64 {
if bs == nil {
return 0
}
return bs.Size
}
@ -117,6 +120,9 @@ func (bs *BtrfsSubvolume) EnsureSize(s uint64) bool {
}
func (bs *BtrfsSubvolume) GetMountpoint() string {
if bs == nil {
return ""
}
return bs.Mountpoint
}
@ -125,6 +131,9 @@ func (bs *BtrfsSubvolume) GetFSType() string {
}
func (bs *BtrfsSubvolume) GetFSSpec() FSSpec {
if bs == nil {
return FSSpec{}
}
return FSSpec{
UUID: bs.UUID,
Label: bs.Name,
@ -132,8 +141,11 @@ func (bs *BtrfsSubvolume) GetFSSpec() FSSpec {
}
func (bs *BtrfsSubvolume) GetFSTabOptions() FSTabOptions {
ops := strings.Join([]string{bs.MntOps, fmt.Sprintf("subvol=%s", bs.Name)}, ",")
if bs == nil {
return FSTabOptions{}
}
ops := strings.Join([]string{bs.MntOps, fmt.Sprintf("subvol=%s", bs.Name)}, ",")
return FSTabOptions{
MntOps: ops,
Freq: 0,