aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-08 22:31:02 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-08 22:31:02 +0000
commit7dda92332fd1bb01e065646ac1f5b098bf681bef (patch)
tree81f4061111de2ae98e48b582821a42db1f1b5bd0
parentb2476dfbcf81eb35135162fe84ce0a0d8fdb731e (diff)
downloadruby-7dda92332fd1bb01e065646ac1f5b098bf681bef.tar.gz
ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard
The control buffer may be used throughout the function, so prevent the string from being lost to GC. * ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard [Bug #11123] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/ancdata.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b9ac37804d..c7cdc8d6ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 9 06:48:36 2015 Eric Wong <e@80x24.org>
+
+ * ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard
+ [Bug #11123]
+
Fri May 8 22:57:24 2015 takiy33 <takiy33@gmail.com>
* test/matrix/test_matrix.rb (test_determinant): refactor test on
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