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

  New Revision: 30255

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

  Log:
    merges r29800 from trunk into ruby_1_9_2.
    --
    * eval_intern.h (CHECK_STACK_OVERFLOW): it was not intended to add
      size_t to a pointer typed VALUE*.  Coverity Scan found this defect.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/eval_intern.h
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/eval_intern.h
===================================================================
--- ruby_1_9_2/eval_intern.h	(revision 30254)
+++ ruby_1_9_2/eval_intern.h	(revision 30255)
@@ -172,7 +172,7 @@
 #define SCOPE_SET(f)   (rb_vm_cref()->nd_visi = (f))
 
 #define CHECK_STACK_OVERFLOW(cfp, margin) do \
-  if (((VALUE *)(cfp)->sp) + (margin) + sizeof(rb_control_frame_t) >= ((VALUE *)cfp)) { \
+  if ((VALUE *)((char *)(((VALUE *)(cfp)->sp) + (margin)) + sizeof(rb_control_frame_t)) >= ((VALUE *)cfp)) { \
       rb_exc_raise(sysstack_error); \
   } \
 while (0)
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30254)
+++ ruby_1_9_2/ChangeLog	(revision 30255)
@@ -1,3 +1,8 @@
+Mon Nov 15 23:54:45 2010  Yusuke Endoh  <mame@t...>
+
+	* eval_intern.h (CHECK_STACK_OVERFLOW): it was not intended to add
+	  size_t to a pointer typed VALUE*.  Coverity Scan found this defect.
+
 Mon Nov 15 23:41:21 2010  Yusuke Endoh  <mame@t...>
 
 	* compile.c (iseq_set_exception_local_table, iseq_set_local_table,
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30254)
+++ ruby_1_9_2/version.h	(revision 30255)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 95
+#define RUBY_PATCHLEVEL 96
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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