[Truffle] Fixed infinite loop in io_sysread primitive.

jruby · Sep 14, 2015 · a786ac3 · a786ac3
1 parent d5f7c47
commit a786ac3
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
@@ -557,6 +557,16 @@ public DynamicObject sysread(VirtualFrame frame, DynamicObject file, int length)
                 getContext().getSafepointManager().poll(this);
 
                 final int readIteration = posix().read(fd, buffer, toRead);
+
+                if (readIteration == -1) {
+                    CompilerDirectives.transferToInterpreter();
+                    throw new RaiseException(getContext().getCoreLibrary().errnoError(posix().errno(), this));
+                }
+
+                if (readIteration == 0) {
+                    return nil();
+                }
+
                 buffer.position(readIteration);
                 toRead -= readIteration;
             }