merge revision(s) 50449: [Backport #11123]

	* ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard
	  [Bug #11123]


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

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index bcd9038183..1ae98c2de3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 21 14:15:10 2015  Eric Wong  <e@80x24.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard
+	  [Bug #11123]
+
 Thu May 21 14:11:50 2015  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (body_ext_mpart): should work even if body-fld-dsp
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index bbbf985e28..3a6d3e7b07 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -1705,6 +1705,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 f50bd0cdac..b51fa5003e 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.7"
 #define RUBY_RELEASE_DATE "2015-05-21"
-#define RUBY_PATCHLEVEL 356
+#define RUBY_PATCHLEVEL 357
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5