One more try to fix #3285

crystal-lang · Sep 14, 2016 · 97c7d0d · 97c7d0d
1 parent fd2d51f
commit 97c7d0d
Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/spec/std/io/io_spec.cr b/spec/std/io/io_spec.cr
@@ -582,6 +582,13 @@ describe IO do
         m.set_encoding("UTF-8", invalid: :skip)
         m.gets_to_end.bytesize.should eq(4277)
       end
+
+      it "decodes incomplete multibyte sequence with skip (3) (#3285)" do
+        str = File.read("#{__DIR__}/../data/io_data_incomplete_multibyte_sequence_2.txt")
+        m = MemoryIO.new(Base64.decode_string str)
+        m.set_encoding("UTF-8", invalid: :skip)
+        m.gets_to_end.bytesize.should eq(8977)
+      end
     end
 
     describe "encode" do

diff --git a/src/io/encoding.cr b/src/io/encoding.cr
@@ -91,7 +91,6 @@ module IO
         # Convert bytes using iconv
         out_buffer = @out_buffer.to_unsafe
         out_buffer_left = LibC::SizeT.new(OUT_BUFFER_SIZE)
-        old_in_buffer_left = @in_buffer_left
         result = @iconv.convert(pointerof(@in_buffer), pointerof(@in_buffer_left), pointerof(out_buffer), pointerof(out_buffer_left))
         @out_slice = @out_buffer[0, OUT_BUFFER_SIZE - out_buffer_left]
 
@@ -103,6 +102,7 @@ module IO
             @iconv.handle_invalid(pointerof(@in_buffer), pointerof(@in_buffer_left))
           when Errno::EINVAL
             # EINVAL means "An incomplete multibyte sequence has been encountered in the input."
+            old_in_buffer_left = @in_buffer_left
 
             # On invalid multibyte sequence we try to read more bytes
             # to see if they complete the sequence