summaryrefslogtreecommitdiff
path: root/enum.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-19 10:25:23 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-19 10:25:23 +0000
commit860bdc3b61dbcacecd4a2fb2c40cf222e91b8fd5 (patch)
tree280c20d9eec8f2500428b71e7beeeff064ad5314 /enum.c
parentdd09dfe3f0bc975db4b84a0e563bcdf862a7063b (diff)
* io.c (read_all): block string buffer modification during
rb_io_fread() by freezing it temporarily. [ruby-dev:24479] * dir.c (rb_push_glob): block call at once the end of method. [ruby-dev:24487] * ext/enumerator/enumerator.c (enum_each_slice): remove rb_gc_force_recycle() to prevent potential SEGV. [ruby-dev:24499] * ext/zlib/zlib.c (zstream_expand_buffer): hide internal string buffer by clearing klass. [ruby-dev:24510] * ext/socket/socket.c (sock_s_getservbyaname): protocol string might be altered. [ruby-dev:24503] * string.c (rb_str_upto): check if return value from succ is a string. [ruby-dev:24504] * io.c (rb_io_popen): get mode string via rb_io_flags_mode() to avoid mode string modification. [ruby-dev:24454] * io.c (rb_io_getline_fast): should take delim as unsigned char to distinguish EOF and '\377'. [ruby-dev:24460] * io.c (rb_io_getline): add check for RS modification. [ruby-dev:24461] * enum.c (enum_sort_by): use qsort() directly instead using rb_iterate(). [ruby-dev:24462] * enum.c (enum_each_with_index): remove rb_gc_force_recycle() to prevent access to recycled object (via continuation for example). [ruby-dev:24463] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enum.c')
-rw-r--r--enum.c29
1 files changed, 8 insertions, 21 deletions
diff --git a/enum.c b/enum.c
index f72c682..9bf68f7 100644
--- a/enum.c
+++ b/enum.c
@@ -117,11 +117,8 @@ enum_find(argc, argv, obj)
rb_scan_args(argc, argv, "01", &if_none);
rb_iterate(rb_each, obj, find_i, (VALUE)memo);
if (memo->u2.value) {
- VALUE result = memo->u1.value;
- rb_gc_force_recycle((VALUE)memo);
- return result;
+ return memo->u1.value;
}
- rb_gc_force_recycle((VALUE)memo);
if (!NIL_P(if_none)) {
return rb_funcall(if_none, rb_intern("call"), 0, 0);
}
@@ -319,7 +316,6 @@ enum_inject(argc, argv, obj)
}
rb_iterate(rb_each, obj, inject_i, (VALUE)memo);
n = memo->u1.value;
- rb_gc_force_recycle((VALUE)memo);
return n;
}
@@ -398,17 +394,14 @@ sort_by_i(i, ary)
return Qnil;
}
-static VALUE
-sort_by_cmp(values, ary)
- VALUE values, ary;
+static int
+sort_by_cmp(aa, bb)
+ NODE **aa, **bb;
{
- NODE *a = (NODE*)RARRAY(values)->ptr[0];
- NODE *b = (NODE*)RARRAY(values)->ptr[1];
+ VALUE a = aa[0]->u1.value;
+ VALUE b = bb[0]->u1.value;
- /* pedantic check; they must be memo nodes */
- Check_Type(a, T_NODE);
- Check_Type(b, T_NODE);
- return rb_funcall(a->u1.value, id_cmp, 1, b->u1.value);
+ return rb_cmpint(rb_funcall(a, id_cmp, 1, b), a, b);
}
/*
@@ -495,7 +488,7 @@ enum_sort_by(obj)
}
rb_iterate(rb_each, obj, sort_by_i, ary);
if (RARRAY(ary)->len > 1) {
- rb_iterate(rb_ary_sort_bang, ary, sort_by_cmp, ary);
+ qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE), sort_by_cmp, 0);
}
for (i=0; i<RARRAY(ary)->len; i++) {
RARRAY(ary)->ptr[i] = RNODE(RARRAY(ary)->ptr[i])->u2.value;
@@ -554,7 +547,6 @@ enum_all(obj)
memo->u1.value = Qtrue;
rb_iterate(rb_each, obj, rb_block_given_p() ? all_iter_i : all_i, (VALUE)memo);
result = memo->u1.value;
- rb_gc_force_recycle((VALUE)memo);
return result;
}
@@ -610,7 +602,6 @@ enum_any(obj)
memo->u1.value = Qfalse;
rb_iterate(rb_each, obj, rb_block_given_p() ? any_iter_i : any_i, (VALUE)memo);
result = memo->u1.value;
- rb_gc_force_recycle((VALUE)memo);
return result;
}
@@ -676,7 +667,6 @@ enum_min(obj)
rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)memo);
result = memo->u1.value;
- rb_gc_force_recycle((VALUE)memo);
return result;
}
@@ -755,7 +745,6 @@ enum_max(obj)
rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)memo);
result = memo->u1.value;
- rb_gc_force_recycle((VALUE)memo);
return result;
}
@@ -793,7 +782,6 @@ enum_member(obj, val)
rb_iterate(rb_each, obj, member_i, (VALUE)memo);
result = memo->u2.value;
- rb_gc_force_recycle((VALUE)memo);
return result;
}
@@ -829,7 +817,6 @@ enum_each_with_index(obj)
NODE *memo = rb_node_newnode(NODE_MEMO, 0, 0, 0);
rb_iterate(rb_each, obj, each_with_index_i, (VALUE)memo);
- rb_gc_force_recycle((VALUE)memo);
return obj;
}