diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-18 12:48:11 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-18 12:48:11 +0000 |
commit | f1a39b9e5cc8ac74757c42aab4721a6d7a08b46c (patch) | |
tree | decfee23abe25bcebdbecace5b6065b4a8670c40 /ext | |
parent | 34152d654ad67035e5e20b6ea7f854b18f942c98 (diff) | |
download | ruby-f1a39b9e5cc8ac74757c42aab4721a6d7a08b46c.tar.gz |
* ext/socket/ancdata.c (bsock_recvmsg_internal): prevent misalignment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/socket/ancdata.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 099e7d3e1b..2ab4f20102 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1117,7 +1117,11 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) #if defined(HAVE_ST_MSG_CONTROL) struct cmsghdr *cmh; size_t maxctllen; - char ctlbuf0[4096], *ctlbuf; + union { + char bytes[4096]; + struct cmsghdr align; + } ctlbuf0; + char *ctlbuf; VALUE ctl_str = Qnil; #endif @@ -1170,7 +1174,7 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) #if defined(HAVE_ST_MSG_CONTROL) if (maxctllen <= sizeof(ctlbuf0)) - ctlbuf = ctlbuf0; + ctlbuf = ctlbuf0.bytes; else { if (NIL_P(ctl_str)) ctl_str = rb_str_tmp_new(maxctllen); |