diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-22 15:08:43 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-22 15:08:43 +0000 |
| commit | 05df3dc80ca34654f8c515bd182673b6eded0265 (patch) | |
| tree | 8f68102abe34596cf13b17f421b68505116f0cfb /ext/socket | |
| parent | e1d4e54b11d1cc1f05829ddee3bc3ae3d5506969 (diff) | |
| download | ruby-05df3dc80ca34654f8c515bd182673b6eded0265.tar.gz ruby-05df3dc80ca34654f8c515bd182673b6eded0265.tar.xz ruby-05df3dc80ca34654f8c515bd182673b6eded0265.zip | |
merge -c 12137
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@12311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index b3966872e..4c23a1c17 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -625,7 +625,7 @@ s_recvfrom(sock, argc, argv, from) rb_raise(rb_eTypeError, "sockaddr size differs - should not happen"); } #endif - if (alen) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */ + if (alen && alen != sizeof(buf)) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */ return rb_assoc_new(str, ipaddr((struct sockaddr*)buf)); else return rb_assoc_new(str, Qnil); @@ -691,7 +691,7 @@ s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from) return str; case RECV_IP: - if (alen) /* connection-oriented socket may not return a from result */ + if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */ addr = ipaddr((struct sockaddr*)buf); break; |