nagachika	2013-03-03 02:45:28 +0900 (Sun, 03 Mar 2013)

  New Revision: 39569

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

  Log:
    merge revision(s) 39282: [Backport #8007]
    
    * vm.c (ENV_IN_HEAP_P): fix off-by-one error.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/vm.c

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39568)
+++ ruby_2_0_0/ChangeLog	(revision 39569)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Mar  3 02:45:13 2013  Kazuki Tsujimoto  <kazuki@c...>
+
+	* vm.c (ENV_IN_HEAP_P): fix off-by-one error.
+
 Sun Mar  3 02:39:01 2013  Ayumu AIZAWA  <ayumu.aizawa@g...>
 
 	* test/ruby/test_thread.rb: fixed typo
Index: ruby_2_0_0/vm.c
===================================================================
--- ruby_2_0_0/vm.c	(revision 39568)
+++ ruby_2_0_0/vm.c	(revision 39569)
@@ -262,7 +262,7 @@ ruby_vm_run_at_exit_hooks(rb_vm_t *vm) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm.c#L262
  */
 
 #define ENV_IN_HEAP_P(th, env)  \
-  (!((th)->stack < (env) && (env) < ((th)->stack + (th)->stack_size)))
+  (!((th)->stack <= (env) && (env) < ((th)->stack + (th)->stack_size)))
 #define ENV_VAL(env)        ((env)[1])
 
 static void
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39568)
+++ ruby_2_0_0/version.h	(revision 39569)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-03"
-#define RUBY_PATCHLEVEL 8
+#define RUBY_PATCHLEVEL 9
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39282


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