Merge branch 'release/0.18'

crystal-lang · Jun 22, 2016 · 7b06993 · 7b06993
2 parents bab00a9 + 99b99a2
commit 7b06993
Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/spec/std/zlib/inflate_spec.cr b/spec/std/zlib/inflate_spec.cr
@@ -48,5 +48,11 @@ module Zlib
       inflate.closed?.should be_true
       io.closed?.should be_true
     end
+
+    it "should not inflate from empty stream" do
+      io = MemoryIO.new("")
+      inflate = Inflate.new(io)
+      inflate.read_byte.should be_nil
+    end
   end
 end
diff --git a/src/zlib/inflate.cr b/src/zlib/inflate.cr
@@ -76,6 +76,7 @@ class Zlib::Inflate
       if @stream.avail_in == 0
         @stream.next_in = @buf.to_unsafe
         @stream.avail_in = @input.read(@buf.to_slice).to_u32
+        return 0 if @stream.avail_in == 0
       end
 
       @stream.avail_out = slice.size.to_u32