matz	2008-03-12 01:15:14 +0900 (Wed, 12 Mar 2008)

  New Revision: 15750

  Modified files:
    trunk/ChangeLog
    trunk/array.c
    trunk/version.h

  Log:
    * array.c (rb_ary_combination): argument check before creating
      Enumerator.
    
    * array.c (rb_ary_permutation): ditto.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=15750&r2=15749&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/array.c?r1=15750&r2=15749&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15750&r2=15749&diff_format=u

Index: array.c
===================================================================
--- array.c	(revision 15749)
+++ array.c	(revision 15750)
@@ -3030,8 +3030,8 @@
     VALUE num;
     long r, n, i;
 
+    n = RARRAY_LEN(ary);                  /* Array length */
     RETURN_ENUMERATOR(ary, argc, argv);   /* Return enumerator if no block */
-    n = RARRAY_LEN(ary);                  /* Array length */
     rb_scan_args(argc, argv, "01", &num);
     r = NIL_P(num) ? n : NUM2LONG(num);   /* Permutation size from argument */
 
@@ -3111,8 +3111,8 @@
 {
     long n, i, len;
 
+    n = NUM2LONG(num);
     RETURN_ENUMERATOR(ary, 1, &num);
-    n = NUM2LONG(num);
     len = RARRAY_LEN(ary);
     if (n < 0 || len < n) {
 	/* yield nothing */
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15749)
+++ ChangeLog	(revision 15750)
@@ -1,3 +1,10 @@
+Tue Mar 11 23:38:39 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* array.c (rb_ary_combination): argument check before creating
+	  Enumerator.
+
+	* array.c (rb_ary_permutation): ditto.
+
 Tue Mar 11 19:48:09 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* numeric.c (fix_coerce): try conversion before type check.
Index: version.h
===================================================================
--- version.h	(revision 15749)
+++ version.h	(revision 15750)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-03-11"
+#define RUBY_RELEASE_DATE "2008-03-12"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080311
+#define RUBY_RELEASE_CODE 20080312
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 12
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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