diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-04 01:20:51 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-04 01:20:51 +0000 |
| commit | da826e6fae8c37134c8764d58ccdf379c5edd4a6 (patch) | |
| tree | 58af38aca9f76e68ee11d008cf95bedf9bf3bac9 /ext | |
| parent | 39b5a8b4bb786d80173b42923f6f790e2570ab6f (diff) | |
| download | ruby-da826e6fae8c37134c8764d58ccdf379c5edd4a6.tar.gz ruby-da826e6fae8c37134c8764d58ccdf379c5edd4a6.tar.xz ruby-da826e6fae8c37134c8764d58ccdf379c5edd4a6.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]
* array.c (rb_ary_uniq_bang): do not push frozen string from hash
table. [ruby-dev:24695]
* array.c (rb_ary_and): ditto.
* array.c (rb_ary_or): ditto.
* ext/enumerator/enumerator.c (each_cons_i): pass copy of an
internal consequent array. [ruby-talk:118691]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/enumerator/enumerator.c | 13 | ||||
| -rw-r--r-- | ext/socket/socket.c | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ext/enumerator/enumerator.c b/ext/enumerator/enumerator.c index 6e47330ce..74785569e 100644 --- a/ext/enumerator/enumerator.c +++ b/ext/enumerator/enumerator.c @@ -87,15 +87,13 @@ each_cons_i(val, memo) { VALUE ary = memo->u1.value; long size = memo->u3.cnt; - long len = RARRAY(ary)->len; - if (len == size) { + if (RARRAY(ary)->len == size) { rb_ary_shift(ary); - rb_ary_push(ary, val); - rb_yield(ary); - } else { - rb_ary_push(ary, val); - if (len + 1 == size) rb_yield(ary); + } + rb_ary_push(ary, val); + if (RARRAY(ary)->len == size) { + rb_yield(rb_ary_dup(ary)); } return Qnil; } @@ -106,7 +104,6 @@ enum_each_cons(obj, n) { long size = NUM2LONG(n); NODE *memo; - VALUE ary; if (size <= 0) rb_raise(rb_eArgError, "invalid size"); memo = rb_node_newnode(NODE_MEMO, rb_ary_new2(size), 0, size); diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 624ea9f2a..1df7cb988 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -436,10 +436,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)) { |