make sure proper encoding set when using #read_nonblock

rubinius · Feb 9, 2016 · 94ff89a · 94ff89a
1 parent c5db267
commit 94ff89a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/io.rb b/core/io.rb
@@ -2828,8 +2828,12 @@ def read_nonblock(size, buffer=nil, opts={})
     end
 
     if str
-      buffer.replace(str) if buffer
-      return str
+      if buffer
+        buffer.replace(str)
+        IO.read_encode(self, buffer)
+      else
+        IO.read_encode(self, str)
+      end
     else
       raise EOFError, "stream closed" unless opts[:exception] == false
     end