kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/socket/ancdata.c (bsock_recvmsg_internal): prevent misalignment.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-18 12:48:11 +00:00
parent 34152d654a
commit f1a39b9e5c
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,6 +1,10 @@
Wed Feb 18 21:47:37 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/ancdata.c (bsock_recvmsg_internal): prevent misalignment.
Wed Feb 18 21:34:30 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/ancdata.c (bsock_sendmsg_internal): avoid misalignment.
* ext/socket/ancdata.c (bsock_sendmsg_internal): prevent misalignment.
Wed Feb 18 21:09:43 2009 Tanaka Akira <akr@fsij.org>

8
ext/socket/ancdata.c
View file

@ -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);