ext/socket: BasicSocket#sendfile will raise an exception if negative …

…value passed.
MacRuby · Dec 7, 2011 · 32b6ef3 · 32b6ef3
1 parent 6873fae
commit 32b6ef3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
@@ -3071,6 +3071,10 @@ socket_sendfile(VALUE self, SEL sel, VALUE file, VALUE offset, VALUE len)
     off_t to_write  = NUM2OFFT(len);
     rb_io_t *socket;
 
+    if (to_offset < 0 || to_write < 0) {
+	rb_raise(rb_eArgError, "negative argument");
+    }
+
     GetOpenFile(self, socket);
     VALUE io = rb_io_check_io(file);
     if (NIL_P(io)) {

diff --git a/spec/macruby/library/socket/sendfile_spec.rb b/spec/macruby/library/socket/sendfile_spec.rb
@@ -49,6 +49,8 @@
       lambda{ client.sendfile(Object.new, 0, 1) }.should raise_error(TypeError)
       lambda{ client.sendfile(path, Object.new, 1) }.should raise_error(TypeError)
       lambda{ client.sendfile(path, 0, Object.new) }.should raise_error(TypeError)
+      lambda{ client.sendfile(path, -1, 1) }.should raise_error(ArgumentError)
+      lambda{ client.sendfile(path, 0, -1) }.should raise_error(ArgumentError)
       client.close
     end