diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-05 08:28:14 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-05 08:28:14 +0000 |
| commit | 7ac8fe74074a085eb79dfbf501f186fe0af7d1b2 (patch) | |
| tree | 8e44ce79615dd7c7dd2c2b0fb08341bd46d56c46 /ext | |
| parent | 20dedbfd9d56a66aa97d4aca2ec0b732eaf7741f (diff) | |
| download | ruby-7ac8fe74074a085eb79dfbf501f186fe0af7d1b2.tar.gz | |
ext/socket/ancdata.c (bsock_sendmsg_internal): portability fix
* ext/socket/ancdata.c (bsock_sendmsg_internal): avoid msg_control
ptr if msg_controllen is zero to fix portability problems.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/ancdata.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index ff17deb2b3..ea55534d97 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1134,6 +1134,7 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) struct msghdr mh; struct iovec iov; VALUE controls = Qnil; + int controls_num; #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) VALUE controls_str = 0; int family; @@ -1157,11 +1158,11 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) #endif StringValue(data); + controls_num = RARRAY_LENINT(controls); - if (!NIL_P(controls)) { + if (controls_num) { #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) int i; - int controls_num = RARRAY_LENINT(controls); size_t last_pad = 0; const VALUE *controls_ptr = RARRAY_CONST_PTR(controls); #if defined(__NetBSD__) |