3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 36cc7fa8e7..fa7d0db419 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 24 03:53:07 2015  Eric Wong  <e@80x24.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard
+	  [Bug #11123]
+
 Sun May 24 03:44:42 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* range.c (linear_object_p, range_include): test if covered for
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index f0dbb2bfeb..3eaed1cb49 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -1711,6 +1711,7 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
                 discard_cmsg(cmh, msg_end, (flags & MSG_PEEK) != 0);
             rb_ary_push(ret, ctl);
         }
+        RB_GC_GUARD(ctl_str);
     }
 #endif
 
diff --git a/version.h b/version.h
index 708cd59838..686266cc22 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.3"
 #define RUBY_RELEASE_DATE "2015-05-24"
-#define RUBY_PATCHLEVEL 127
+#define RUBY_PATCHLEVEL 128
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5