Merge pull request #31 from JuliaComputing/jb/align8

make sure alignment is always a multiple of 8
JuliaData · Jul 1, 2019 · 18869cc · 18869cc
2 parents 86cf0ca + 99bdef5
commit 18869cc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/io.jl b/src/io.jl
@@ -8,17 +8,19 @@ can_mmap(io::IOStream) = true
 can_mmap(io::IO) = false
 
 function padalign(io::IOStream, align=8)
+    align = (align + 7) & -8  # make sure alignment is a multiple of 8
     p = position(io)
-    if p & (align-1) !== 0
-        write(io, zeros(UInt8, (align-p % align)))
+    if p & (align-1) != 0
+        write(io, zeros(UInt8, (align - (p % align))))
     end
 end
 padalign(io, align=8) = nothing
 
 function seekpadded(io::IOStream, align=8)
+    align = (align + 7) & -8
     p = position(io)
-    if p & (align-1) !== 0
-        seek(io, p+(align-p%align))
+    if p & (align-1) != 0
+        seek(io, p + (align - (p % align)))
     end
 end
 seekpadded(io, align=8) = nothing

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -28,10 +28,15 @@ function roundtrip(x, eq=(==), io=IOBuffer())
     end
 end
 
+primitive type TestInt160 160 end
+
 @testset "Array" begin
     roundtrip(rand(10))
     roundtrip(BitArray(rand(Bool,10)))
     roundtrip(map(Ref, rand(10)), (x,y)->getindex.(x) == getindex.(y))
+    mktemp() do path, f
+        roundtrip(Vector{TestInt160}(undef, 10), (x,y)->true, f)
+    end
 
     io = IOBuffer()
     x = Array{Union{}}(undef, 10)