Prevents premature EOFError on blocking reads

Blocks until the required number of bytes has been read. Only throws EOFError on actual EOF. Fixes JuliaLang#13559.
hessammehr · Oct 15, 2015 · 122205a · 122205a
1 parent b22b652
commit 122205a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/base/iostream.jl b/base/iostream.jl
@@ -167,7 +167,11 @@ function read(s::IOStream, ::Type{UInt8})
 end
 
 function read{T<:Union{UInt16, Int16, UInt32, Int32, UInt64, Int64}}(s::IOStream, ::Type{T})
-    ccall(:jl_ios_get_nbyte_int, UInt64, (Ptr{Void}, Csize_t), s.ios, sizeof(T)) % T
+    data = readbytes(s, sizeof(T), all=true)
+    if length(data) < sizeof(T)
+        throw(EOFError())
+    end
+    first(reinterpret(T, data))
 end
 
 function read!(s::IOStream, a::Vector{UInt8})