diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-18 12:35:22 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-18 12:35:22 +0000 |
| commit | 34152d654ad67035e5e20b6ea7f854b18f942c98 (patch) | |
| tree | 15b4ffc82a3ccb9d6038d9c2696ca746c6baea2a /ext/socket/ancdata.c | |
| parent | d89e09b3087dbaf09301648868d0d8ac340da04c (diff) | |
* ext/socket/ancdata.c (bsock_sendmsg_internal): avoid misalignment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/ancdata.c')
| -rw-r--r-- | ext/socket/ancdata.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 68bb272ef3..099e7d3e1b 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -899,7 +899,8 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) int level, type; VALUE cdata; long oldlen; - struct cmsghdr *cmh; + struct cmsghdr cmh; + char *cmsg; size_t cspace; v = rb_check_convert_type(elt, T_ARRAY, "Array", "to_ary"); if (!NIL_P(v)) { @@ -921,15 +922,17 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) oldlen = RSTRING_LEN(controls_str); cspace = CMSG_SPACE(RSTRING_LEN(cdata)); rb_str_resize(controls_str, oldlen + cspace); - cmh = (struct cmsghdr *)(RSTRING_PTR(controls_str)+oldlen); - memset((char *)cmh, 0, cspace); - cmh->cmsg_level = level; - cmh->cmsg_type = type; - cmh->cmsg_len = CMSG_LEN(RSTRING_LEN(cdata)); - MEMCPY(CMSG_DATA(cmh), RSTRING_PTR(cdata), char, RSTRING_LEN(cdata)); - last_level = cmh->cmsg_level; - last_type = cmh->cmsg_type; - last_pad = cspace - cmh->cmsg_len; + cmsg = RSTRING_PTR(controls_str)+oldlen; + memset((char *)cmsg, 0, cspace); + memset((char *)&cmh, 0, sizeof(cmh)); + cmh.cmsg_level = level; + cmh.cmsg_type = type; + cmh.cmsg_len = CMSG_LEN(RSTRING_LEN(cdata)); + MEMCPY(cmsg, &cmh, char, sizeof(cmh)); + MEMCPY(cmsg+((char*)CMSG_DATA(&cmh)-(char*)&cmh), RSTRING_PTR(cdata), char, RSTRING_LEN(cdata)); + last_level = cmh.cmsg_level; + last_type = cmh.cmsg_type; + last_pad = cspace - cmh.cmsg_len; } if (last_pad) { /* |