kosaki	2011-09-14 11:46:37 +0900 (Wed, 14 Sep 2011)

  New Revision: 33268

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

  Log:
    merge revision(s) 33266:
    
    * thread.c (rb_fd_rcopy): added an argument guard.
      Patch by NAKAMURA Usaku. [Bug #5306] [ruby-core:39435]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/thread.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 33267)
+++ ruby_1_9_3/ChangeLog	(revision 33268)
@@ -1,3 +1,8 @@
+Wed Sep 14 11:46:30 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* thread.c (rb_fd_rcopy): added an argument guard.
+	  Patch by NAKAMURA Usaku. [Bug #5306] [ruby-core:39435]
+
 Tue Sep 13 09:28:58 2011  Koichi Sasada  <ko1@a...>
 
 	* NEWS: wrote about rb_reserved_fd_p() and objspace.
Index: ruby_1_9_3/thread.c
===================================================================
--- ruby_1_9_3/thread.c	(revision 33267)
+++ ruby_1_9_3/thread.c	(revision 33268)
@@ -2465,7 +2465,9 @@
 {
     int max = rb_fd_max(src);
 
-    if (max > FD_SETSIZE) {
+    /* we assume src is the result of select() with dst, so dst should be
+     * larger or equal than src. */
+    if (max > FD_SETSIZE || max > dst->fd_count) {
 	rb_raise(rb_eArgError, "too large fdsets");
     }
 
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 33267)
+++ ruby_1_9_3/version.h	(revision 33268)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
 #define RUBY_PATCHLEVEL -1
 
-#define RUBY_RELEASE_DATE "2011-09-13"
+#define RUBY_RELEASE_DATE "2011-09-14"
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
 
 #include "ruby/version.h"
 

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