From 09190693dfc81471b5edf3705a77fc54a89e8782 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 12 Feb 2023 11:29:56 -0700 Subject: btrfsitem: DirEntry: Fix XATTR name/value ordering --- lib/btrfs/btrfsitem/item_dir.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/btrfs/btrfsitem/item_dir.go b/lib/btrfs/btrfsitem/item_dir.go index b3e33f4..584e44d 100644 --- a/lib/btrfs/btrfsitem/item_dir.go +++ b/lib/btrfs/btrfsitem/item_dir.go @@ -49,10 +49,10 @@ func (o *DirEntry) UnmarshalBinary(dat []byte) (int, error) { if err := binutil.NeedNBytes(dat, 0x1e+int(o.DataLen)+int(o.NameLen)); err != nil { return 0, err } - o.Data = dat[n : n+int(o.DataLen)] - n += int(o.DataLen) o.Name = dat[n : n+int(o.NameLen)] n += int(o.NameLen) + o.Data = dat[n : n+int(o.DataLen)] + n += int(o.DataLen) return n, nil } @@ -63,8 +63,8 @@ func (o DirEntry) MarshalBinary() ([]byte, error) { if err != nil { return dat, err } - dat = append(dat, o.Data...) dat = append(dat, o.Name...) + dat = append(dat, o.Data...) return dat, nil } -- cgit v1.2.3-2-g168b