kosaki	2011-11-12 11:27:51 +0900 (Sat, 12 Nov 2011)

  New Revision: 33717

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33717

  Log:
    * io.c (rb_ioctl): don't expose our sanity check value to ruby script.
      It may change string value meaning if the value is string.
      (e.g. MacOS X has  F_GETPATH ioctl)
    * io.c (rb_fcntl): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33716)
+++ ChangeLog	(revision 33717)
@@ -1,3 +1,10 @@
+Sat Nov 12 11:13:18 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* io.c (rb_ioctl): don't expose our sanity check value to ruby script.
+	  It may change string value meaning if the value is string.
+	  (e.g. MacOS X has  F_GETPATH ioctl)
+	* io.c (rb_fcntl): ditto.
+
 Sat Nov 12 11:06:02 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* io.c (ioctl_req_t): Type of req argument of ioctl() depend on platform.
Index: io.c
===================================================================
--- io.c	(revision 33716)
+++ io.c	(revision 33717)
@@ -7973,8 +7973,10 @@
     GetOpenFile(io, fptr);
     retval = do_ioctl(fptr->fd, cmd, narg);
     if (retval < 0) rb_sys_fail_path(fptr->pathv);
-    if (RB_TYPE_P(arg, T_STRING) && RSTRING_PTR(arg)[RSTRING_LEN(arg)-1] != 17) {
-	rb_raise(rb_eArgError, "return value overflowed string");
+    if (RB_TYPE_P(arg, T_STRING)) {
+	if (RSTRING_PTR(arg)[RSTRING_LEN(arg)-1] != 17)
+	    rb_raise(rb_eArgError, "return value overflowed string");
+	RSTRING_PTR(arg)[RSTRING_LEN(arg)-1] = '\0';
     }
 
     return INT2NUM(retval);
@@ -8053,8 +8055,10 @@
     GetOpenFile(io, fptr);
     retval = do_fcntl(fptr->fd, cmd, narg);
     if (retval < 0) rb_sys_fail_path(fptr->pathv);
-    if (RB_TYPE_P(arg, T_STRING) && RSTRING_PTR(arg)[RSTRING_LEN(arg)-1] != 17) {
-	rb_raise(rb_eArgError, "return value overflowed string");
+    if (RB_TYPE_P(arg, T_STRING)) {
+	if (RSTRING_PTR(arg)[RSTRING_LEN(arg)-1] != 17)
+	    rb_raise(rb_eArgError, "return value overflowed string");
+	RSTRING_PTR(arg)[RSTRING_LEN(arg)-1] = '\0';
     }
 
     if (cmd == F_SETFL) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/