usa	2015-05-21 14:16:26 +0900 (Thu, 21 May 2015)

  New Revision: 50584

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

  Log:
    merge revision(s) 50449: [Backport #11123]
    
    * ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard
      [Bug #11123]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/socket/ancdata.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 50583)
+++ ruby_2_1/ChangeLog	(revision 50584)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu May 21 14:15:10 2015  Eric Wong  <e@8...>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard
+	  [Bug #11123]
+
 Thu May 21 14:11:50 2015  Shugo Maeda  <shugo@r...>
 
 	* lib/net/imap.rb (body_ext_mpart): should work even if body-fld-dsp
Index: ruby_2_1/ext/socket/ancdata.c
===================================================================
--- ruby_2_1/ext/socket/ancdata.c	(revision 50583)
+++ ruby_2_1/ext/socket/ancdata.c	(revision 50584)
@@ -1705,6 +1705,7 @@ bsock_recvmsg_internal(int argc, VALUE * https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/socket/ancdata.c#L1705
                 discard_cmsg(cmh, msg_end, (flags & MSG_PEEK) != 0);
             rb_ary_push(ret, ctl);
         }
+        RB_GC_GUARD(ctl_str);
     }
 #endif
 
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50583)
+++ ruby_2_1/version.h	(revision 50584)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50449


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