fix: bad alignment calculation

Another attempt at fixing #26. Still no automatic reproducer test script unfortunately. Closes #38 (thanks @tc-hib once more!)
akavel · Mar 12, 2021 · 48a25be · 48a25be
1 parent 67980f0
commit 48a25be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/coff/coff.go b/coff/coff.go
@@ -263,7 +263,7 @@ func (coff *Coff) AddResource(kind uint32, id uint16, data Sizer) {
 func pad(data Sizer) PaddedData {
 	return PaddedData{
 		Data:    data,
-		Padding: make([]byte, (data.Size()+7)&^7),
+		Padding: make([]byte, -data.Size()&7),
 	}
 }
 

diff --git a/rsrc_test.go b/rsrc_test.go
@@ -17,6 +17,9 @@ func TestBuildSucceeds(t *testing.T) {
 	}{{
 		comment: "icon",
 		args:    []string{"-ico", "akavel.ico"},
+	}, {
+		comment: "unaligned icon (?) - issue #26",
+		args:    []string{"-ico", "syncthing.ico"},
 	}, {
 		comment: "manifest",
 		args:    []string{"-manifest", "manifest.xml"},

diff --git a/testdata/syncthing.ico b/testdata/syncthing.ico