From f1a39b9e5cc8ac74757c42aab4721a6d7a08b46c Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 18 Feb 2009 12:48:11 +0000 Subject: [PATCH] * 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 --- ChangeLog | 6 +++++- ext/socket/ancdata.c | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 547a43c9b2..4f5cd08085 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ +Wed Feb 18 21:47:37 2009 Tanaka Akira + + * ext/socket/ancdata.c (bsock_recvmsg_internal): prevent misalignment. + Wed Feb 18 21:34:30 2009 Tanaka Akira - * 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 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);