3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b25f64d667..23c444d8b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 21 01:34:48 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (id2ref): prohibit from accessing internal objects.
+	  [ruby-core:68348] [Bug #10918]
+
 Thu May 21 01:32:02 2015  Rei Odaira  <Rei.Odaira@gmail.com>
 
 	* ext/pty/pty.c: AIX supports autopush.
diff --git a/gc.c b/gc.c
index c84da503ea..b843e7bb73 100644
--- a/gc.c
+++ b/gc.c
@@ -2761,6 +2761,9 @@ id2ref(VALUE obj, VALUE objid)
     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;
 }
 
diff --git a/version.h b/version.h
index d7b3a3b256..1db1d8a105 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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