nagachika	2015-05-21 02:06:08 +0900 (Thu, 21 May 2015)

  New Revision: 50565

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

  Log:
    merge revision(s) 49792: [Backport #10918]
    
    * gc.c (id2ref): prohibit from accessing internal objects.
      [ruby-core:68348] [Bug #10918]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/gc.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 50564)
+++ ruby_2_2/ChangeLog	(revision 50565)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu May 21 01:34:48 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* gc.c (id2ref): prohibit from accessing internal objects.
+	  [ruby-core:68348] [Bug #10918]
+
 Thu May 21 01:32:02 2015  Rei Odaira  <Rei.Odaira@g...>
 
 	* ext/pty/pty.c: AIX supports autopush.
Index: ruby_2_2/gc.c
===================================================================
--- ruby_2_2/gc.c	(revision 50564)
+++ ruby_2_2/gc.c	(revision 50565)
@@ -2761,6 +2761,9 @@ id2ref(VALUE obj, VALUE objid) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/gc.c#L2761
     if (!is_live_object(objspace, ptr)) {
 	rb_raise(rb_eRangeError, "%p is recycled object", p0);
     }
+    if (RBASIC(ptr)->klass == 0) {
+	rb_raise(rb_eRangeError, "%p is internal object", p0);
+    }
     return (VALUE)ptr;
 }
 
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 50564)
+++ ruby_2_2/version.h	(revision 50565)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.3"
 #define RUBY_RELEASE_DATE "2015-05-21"
-#define RUBY_PATCHLEVEL 114
+#define RUBY_PATCHLEVEL 115
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49792


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