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 | 577689150718955df5b3d990dc4e88cab2e1c818 (patch) | |
| tree | decfee23abe25bcebdbecace5b6065b4a8670c40 /ext/socket | |
| parent | d143681e6ac3767d288e09141964a00f5938f9be (diff) | |
| download | ruby-577689150718955df5b3d990dc4e88cab2e1c818.tar.gz ruby-577689150718955df5b3d990dc4e88cab2e1c818.tar.xz ruby-577689150718955df5b3d990dc4e88cab2e1c818.zip | |
* ext/socket/ancdata.c (bsock_recvmsg_internal): prevent misalignment.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -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 099e7d3e1..2ab4f2010 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); |