merge revision(s) 40791,40806: [Backport #8424]

	* eval_intern.h (TH_PUSH_TAG): ensure jmpbuf to be accessible before
	  pushing tag to get rid of unaccessible tag by stack overflow.

	* vm_core.h (rb_vm_tag): move jmpbuf between tag and prev so ensure to
	  be accessible.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 18 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f336812d65..0a7a9482cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Jun  4 00:02:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_vm_tag): move jmpbuf between tag and prev so ensure to
+	  be accessible.
+
+Tue Jun  4 00:02:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_intern.h (TH_PUSH_TAG): ensure jmpbuf to be accessible before
+	  pushing tag to get rid of unaccessible tag by stack overflow.
+
 Mon Jun  3 23:22:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* compile.c (iseq_compile_each): forward anonymous and first keyword
diff --git a/version.h b/version.h
index 6a294c52f3..10b958bdcd 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-06-03"
-#define RUBY_PATCHLEVEL 199
+#define RUBY_RELEASE_DATE "2013-06-04"
+#define RUBY_PATCHLEVEL 200
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
 
 #include "ruby/version.h"
 
diff --git a/vm_core.h b/vm_core.h
index 2ac57fc112..0bffdd3daa 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -461,10 +461,14 @@ enum rb_thread_status {
 
 typedef RUBY_JMP_BUF rb_jmpbuf_t;
 
+/*
+  the members which are written in TH_PUSH_TAG() should be placed at
+  the beginning and the end, so that entire region is accessible.
+*/
 struct rb_vm_tag {
-    rb_jmpbuf_t buf;
     VALUE tag;
     VALUE retval;
+    rb_jmpbuf_t buf;
     struct rb_vm_tag *prev;
 };