Quick and dirty fix for resource data alignment.

Probably fixes #12 and #26
akavel · Dec 10, 2020 · 9547050 · 9547050
1 parent f8b6563
commit 9547050
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/binutil/writer.go b/binutil/writer.go
@@ -29,5 +29,14 @@ func (w *Writer) WriteFromSized(r SizedReader) {
 	}
 	var n int64
 	n, w.Err = io.CopyN(w.W, r, r.Size())
+	if w.Err != nil {
+		return
+	}
+	aligned := (n-1)&^7 + 8
+	if aligned > n {
+		var z [8]byte
+		w.W.Write(z[:aligned-n])
+		n = aligned
+	}
 	w.Offset += uint32(n)
 }
diff --git a/coff/coff.go b/coff/coff.go
@@ -336,7 +336,7 @@ func freezeCommon2(v reflect.Value, offset *uint32) error {
 	}
 	vv, ok := v.Interface().(Sizer)
 	if ok {
-		*offset += uint32(vv.Size())
+		*offset += uint32((vv.Size()-1)&^7 + 8)
 		return binutil.WALK_SKIP
 	}
 	return nil