correct fix for JuliaLang#5653

tknopp · Feb 11, 2014 · 4b37277 · 4b37277
1 parent b4cc27b
commit 4b37277
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/base/io.jl b/base/io.jl
@@ -486,7 +486,7 @@ function readbytes!(s::IOStream, b::Array{Uint8}, nb=length(b))
  end
  nr += int(ccall(:ios_readall, Uint,
  (Ptr{Void}, Ptr{Void}, Uint),
- s.ios, pointer(b, nr+1), nb - nr))
+ s.ios, pointer(b, nr+1), min(lb-nr, nb-nr)))
  end
  if lb > olb
  resize!(b, nr) # shrink to just contain input data if was resized

diff --git a/src/cgutils.cpp b/src/cgutils.cpp
@@ -594,6 +594,7 @@ static jl_value_t *julia_type_of_without_metadata(Value *v, bool err=true)
 static jl_value_t *julia_type_of(Value *v)
 {
  MDNode *mdn;
+ assert(v != NULL);
  if (dyn_cast<Instruction>(v) == NULL ||
  (mdn = ((Instruction*)v)->getMetadata("julia_type")) == NULL) {
  return julia_type_of_without_metadata(v, true);