diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-04 00:53:21 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-04 00:53:21 +0000 |
| commit | d03e8fe6653c5759c7c2601e953fde3e1bbf5e0f (patch) | |
| tree | 8ea3214a7838720e3ac1ceedc4e5c7292b1fe27f /ext | |
| parent | 26dbadcb20a5f8ece3376426d8c9f408ca807db7 (diff) | |
| download | ruby-d03e8fe6653c5759c7c2601e953fde3e1bbf5e0f.tar.gz ruby-d03e8fe6653c5759c7c2601e953fde3e1bbf5e0f.tar.xz ruby-d03e8fe6653c5759c7c2601e953fde3e1bbf5e0f.zip | |
* gc.c (gc_mark): enable GC stack checking.
* string.c (str_gsub): lock strings temporarily. [ruby-dev:24687]
* ext/socket/socket.c (s_recvfrom): tmplock input buffer.
[ruby-dev:24705]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/socket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 5c57f2e1f..4cc9adc07 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -474,10 +474,12 @@ s_recvfrom(sock, argc, argv, from) str = rb_tainted_str_new(0, buflen); retry: + rb_str_locktmp(str); rb_thread_wait_fd(fd); TRAP_BEG; slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen); TRAP_END; + rb_str_unlocktmp(str); if (slen < 0) { if (rb_io_wait_readable(fd)) { |