naruse	2012-02-21 18:27:51 +0900 (Tue, 21 Feb 2012)

  New Revision: 34718

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

  Log:
    merge revision(s) 33326:
    
     warnings.

  Modified files:
    branches/ruby_1_9_3/ext/date/date_core.c
    branches/ruby_1_9_3/iseq.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/iseq.c
===================================================================
--- ruby_1_9_3/iseq.c	(revision 34717)
+++ ruby_1_9_3/iseq.c	(revision 34718)
@@ -1313,7 +1313,7 @@
 	}
 
 	rb_ary_push(body, ary);
-	pos += RARRAY_LEN(ary);
+	pos += RARRAY_LENINT(ary); /* reject too huge data */
     }
 
     st_free_table(labels_table);
Index: ruby_1_9_3/ext/date/date_core.c
===================================================================
--- ruby_1_9_3/ext/date/date_core.c	(revision 34717)
+++ ruby_1_9_3/ext/date/date_core.c	(revision 34718)
@@ -2381,7 +2381,7 @@
 	    n = FIX2LONG(vs);
 	    if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
 		return 0;
-	    *rof = n;
+	    *rof = (int)n;
 	    return 1;
 	}
     }
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34717)
+++ ruby_1_9_3/version.h	(revision 34718)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 134
+#define RUBY_PATCHLEVEL 135
 
 #define RUBY_RELEASE_DATE "2012-02-21"
 #define RUBY_RELEASE_YEAR 2012

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