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/socket.c (s_recvfrom): sending length should be an

Browse source 
invariant while retrying on EAGAIN.  [ruby-talk:89962]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-01-27 02:09:34 +00:00
parent 2a49751d8e
commit 8df4564367
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Jan 27 11:04:40 2004 FUKUMOTO Atsushi <fukumoto@nospam.imasy.or.jp>
* ext/socket/socket.c (s_recvfrom): sending length should be an
invariant while retrying on EAGAIN. [ruby-talk:89962]
Tue Jan 27 10:31:28 2004 NAKAMURA Usaku <usa@ruby-lang.org> Tue Jan 27 10:31:28 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/win32ole/win32ole.c (set_argv): fix condition. * ext/win32ole/win32ole.c (set_argv): fix condition.

7
ext/socket/socket.c
View file

@ -416,6 +416,7 @@ s_recvfrom(sock, argc, argv, from)
char buf[1024]; char buf[1024];
socklen_t alen = sizeof buf; socklen_t alen = sizeof buf;
VALUE len, flg; VALUE len, flg;
long buflen;
long slen; long slen;
int fd, flags; int fd, flags;
@ -430,13 +431,13 @@ s_recvfrom(sock, argc, argv, from)
} }
fd = fileno(fptr->f); fd = fileno(fptr->f);
slen = NUM2INT(len); buflen = NUM2INT(len);
str = rb_tainted_str_new(0, slen); str = rb_tainted_str_new(0, buflen);
retry: retry:
rb_thread_wait_fd(fd); rb_thread_wait_fd(fd);
TRAP_BEG; 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; TRAP_END;
if (slen < 0) { if (slen < 0) {