diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-27 02:09:34 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-27 02:09:34 +0000 |
| commit | cc002887e3a40446ce42f6e4082361a1d09ec1fb (patch) | |
| tree | 9a38639a759e58f00ecaf4921052eba05b6cd24c /ext | |
| parent | 6ed7a0835bd86403cfbc792bb1fe030481242e59 (diff) | |
* ext/socket/socket.c (s_recvfrom): sending length should be an
invariant while retrying on EAGAIN. [ruby-talk:89962]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/socket.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 8a1825d795..eb75168cb2 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -416,6 +416,7 @@ s_recvfrom(sock, argc, argv, from) char buf[1024]; socklen_t alen = sizeof buf; VALUE len, flg; + long buflen; long slen; int fd, flags; @@ -430,13 +431,13 @@ s_recvfrom(sock, argc, argv, from) } fd = fileno(fptr->f); - slen = NUM2INT(len); - str = rb_tainted_str_new(0, slen); + buflen = NUM2INT(len); + str = rb_tainted_str_new(0, buflen); retry: rb_thread_wait_fd(fd); TRAP_BEG; - slen = recvfrom(fd, RSTRING(str)->ptr, slen, flags, (struct sockaddr*)buf, &alen); + slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen); TRAP_END; if (slen < 0) { |