Merge pull request #77 from TheManticoreProject/bugfix-acl-header-marshal-rawbytessize

[bug] Fix RawBytesSize accumulating across Marshal calls in ACL headers (#74)

Author: p0dalirius

acl/DiscretionaryAccessControlListHeader.go

@@ -66,6 +66,8 @@ func (daclheader *DiscretionaryAccessControlListHeader) Unmarshal(marshalledData
 func (daclheader *DiscretionaryAccessControlListHeader) Marshal() ([]byte, error) {
 	var marshalledData []byte
 
+	daclheader.RawBytesSize = 0
+
 	bytesStream, err := daclheader.Revision.Marshal()
 	if err != nil {
 		return nil, err

acl/DiscretionaryAccessControlListHeader_test.go

@@ -75,3 +75,27 @@ func TestDiscretionaryAccessControlListHeader_Involution(t *testing.T) {
 		t.Errorf("Sbz2 value not preserved: expected %d, got %d", daclHeader.Sbz2, daclHeader2.Sbz2)
 	}
 }
+
+// TestDiscretionaryAccessControlListHeader_Marshal_RawBytesSize_Idempotent
+// verifies that repeated Marshal calls report the fixed 8-byte header size
+// rather than accumulating it.
+func TestDiscretionaryAccessControlListHeader_Marshal_RawBytesSize_Idempotent(t *testing.T) {
+	daclHeaderBytes, err := hex.DecodeString("0100140002000000")
+	if err != nil {
+		t.Fatalf("Failed to decode header hex: %v", err)
+	}
+
+	daclHeader := &DiscretionaryAccessControlListHeader{}
+	if _, err := daclHeader.Unmarshal(daclHeaderBytes); err != nil {
+		t.Fatalf("Failed to unmarshal DACL header: %v", err)
+	}
+
+	for i := 0; i < 3; i++ {
+		if _, err := daclHeader.Marshal(); err != nil {
+			t.Fatalf("Marshal() call %d error = %v", i, err)
+		}
+		if daclHeader.RawBytesSize != 8 {
+			t.Errorf("after Marshal() call %d: RawBytesSize = %d, want 8", i, daclHeader.RawBytesSize)
+		}
+	}
+}

acl/SystemAccessControlListHeader.go

@@ -65,6 +65,8 @@ func (saclheader *SystemAccessControlListHeader) Unmarshal(marshalledData []byte
 func (saclheader *SystemAccessControlListHeader) Marshal() ([]byte, error) {
 	var marshalledData []byte
 
+	saclheader.RawBytesSize = 0
+
 	bytesStream, err := saclheader.Revision.Marshal()
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal Revision: %w", err)

acl/SystemAccessControlListHeader_test.go

@@ -63,6 +63,28 @@ func TestSystemAccessControlListHeader_MarshalUnmarshal(t *testing.T) {
 	}
 }
 
+// TestSystemAccessControlListHeader_Marshal_RawBytesSize_Idempotent verifies
+// that repeated Marshal calls report the fixed 8-byte header size rather than
+// accumulating it.
+func TestSystemAccessControlListHeader_Marshal_RawBytesSize_Idempotent(t *testing.T) {
+	header := SystemAccessControlListHeader{
+		Revision: revision.AccessControlListRevision{Value: 0x02},
+		Sbz1:     0x00,
+		AclSize:  0x30,
+		AceCount: 0x05,
+		Sbz2:     0x00,
+	}
+
+	for i := 0; i < 3; i++ {
+		if _, err := header.Marshal(); err != nil {
+			t.Fatalf("Marshal() call %d error = %v", i, err)
+		}
+		if header.RawBytesSize != 8 {
+			t.Errorf("after Marshal() call %d: RawBytesSize = %d, want 8", i, header.RawBytesSize)
+		}
+	}
+}
+
 func TestSystemAccessControlListHeader_MarshalUnmarshalWithEdgeCases(t *testing.T) {
 	testCases := []struct {
 		name     string