nagachika	2015-05-24 03:53:48 +0900 (Sun, 24 May 2015)

  New Revision: 50631

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

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

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/socket/ancdata.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 50630)
+++ ruby_2_2/ChangeLog	(revision 50631)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sun May 24 03:53:07 2015  Eric Wong  <e@8...>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard
+	  [Bug #11123]
+
 Sun May 24 03:44:42 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* range.c (linear_object_p, range_include): test if covered for
Index: ruby_2_2/ext/socket/ancdata.c
===================================================================
--- ruby_2_2/ext/socket/ancdata.c	(revision 50630)
+++ ruby_2_2/ext/socket/ancdata.c	(revision 50631)
@@ -1711,6 +1711,7 @@ bsock_recvmsg_internal(int argc, VALUE * https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/socket/ancdata.c#L1711
                 discard_cmsg(cmh, msg_end, (flags & MSG_PEEK) != 0);
             rb_ary_push(ret, ctl);
         }
+        RB_GC_GUARD(ctl_str);
     }
 #endif
 
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 50630)
+++ ruby_2_2/version.h	(revision 50631)
@@ -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-24"
-#define RUBY_PATCHLEVEL 127
+#define RUBY_PATCHLEVEL 128
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5

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


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