yugui	2010-12-20 22:22:21 +0900 (Mon, 20 Dec 2010)

  New Revision: 30254

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

  Log:
    merges r29799 from trunk into ruby_1_9_2.
    --
    * compile.c (iseq_set_exception_local_table, iseq_set_local_table,
      rb_iseq_build_from_ary): fix type inconsistency (which is benign
      because sizeof(ID) == sizeof(ID*), though).  Coverity Scan found
      these bugs.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/compile.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30253)
+++ ruby_1_9_2/ChangeLog	(revision 30254)
@@ -1,3 +1,10 @@
+Mon Nov 15 23:41:21 2010  Yusuke Endoh  <mame@t...>
+
+	* compile.c (iseq_set_exception_local_table, iseq_set_local_table,
+	  rb_iseq_build_from_ary): fix type inconsistency (which is benign
+	  because sizeof(ID) == sizeof(ID*), though).  Coverity Scan found
+	  these bugs.
+
 Mon Nov 15 22:47:27 2010  Yusuke Endoh  <mame@t...>
 
 	* vm_eval.c (rb_funcall): ensure va_end after va_init_list.  Coverity
Index: ruby_1_9_2/compile.c
===================================================================
--- ruby_1_9_2/compile.c	(revision 30253)
+++ ruby_1_9_2/compile.c	(revision 30254)
@@ -985,7 +985,7 @@
     ID id_dollar_bang;
 
     CONST_ID(id_dollar_bang, "#$!");
-    iseq->local_table = (ID *)ALLOC_N(ID *, 1);
+    iseq->local_table = (ID *)ALLOC_N(ID, 1);
     iseq->local_table_size = 1;
     iseq->local_size = iseq->local_table_size + 1;
     iseq->local_table[0] = id_dollar_bang;
@@ -1204,8 +1204,8 @@
     }
 
     if (size > 0) {
-	iseq->local_table = (ID *)ALLOC_N(ID *, size);
-	MEMCPY(iseq->local_table, tbl, ID *, size);
+	iseq->local_table = (ID *)ALLOC_N(ID, size);
+	MEMCPY(iseq->local_table, tbl, ID, size);
     }
 
     iseq->local_size = iseq->local_table_size = size;
@@ -5374,7 +5374,7 @@
     INIT_ANCHOR(anchor);
 
     iseq->local_table_size = RARRAY_LENINT(locals);
-    iseq->local_table = tbl = (ID *)ALLOC_N(ID *, iseq->local_table_size);
+    iseq->local_table = tbl = (ID *)ALLOC_N(ID, iseq->local_table_size);
     iseq->local_size = iseq->local_table_size + 1;
 
     for (i=0; i<RARRAY_LEN(locals); i++) {
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30253)
+++ ruby_1_9_2/version.h	(revision 30254)
@@ -1,13 +1,13 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 94
+#define RUBY_PATCHLEVEL 95
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
 
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 8
-#define RUBY_RELEASE_DATE "2010-12-08"
+#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DATE "2010-12-20"
 
 #include "ruby/version.h"
 

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