diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-11 17:18:12 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-11 17:18:12 +0000 |
| commit | 7ebca22266ccd459e3848046293ee7b04fc0675b (patch) | |
| tree | cce0946c467fb7ff398e55bb608f3314bc706bf3 /ext/socket | |
| parent | 70e6382b73506d24557e4a1add02917516710a20 (diff) | |
merge revision(s) 50685: [Backport #11198]
* ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile
[ruby-core:69419] [Feature #11198]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/ancdata.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 3eaed1cb49..b69417e9db 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1135,7 +1135,7 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) struct msghdr mh; struct iovec iov; #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) - volatile VALUE controls_str = 0; + VALUE controls_str = 0; VALUE *controls_ptr = NULL; int family; #endif @@ -1291,6 +1291,9 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) rb_readwrite_sys_fail(RB_IO_WAIT_WRITABLE, "sendmsg(2) would block"); rb_sys_fail("sendmsg(2)"); } +#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) + RB_GC_GUARD(controls_str); +#endif return SSIZET2NUM(ss); } |