diff --git a/ChangeLog b/ChangeLog index d061059cfe..a03b1a74a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Jan 24 15:15:30 2008 Yukihiro Matsumoto + + * array.c (collect_bang_i): use rb_ary_store() to avoid potential + memory corruption. a patch from Yusuke Endoh + in [ruby-dev:33328]. + + * array.c (ITERATE): remove unnecessary macro. + Thu Jan 24 15:09:40 2008 Tanaka Akira * time.c (make_time_t): revert round trip test. [ruby-dev:33058] diff --git a/array.c b/array.c index 89614e6085..3e7e53535b 100644 --- a/array.c +++ b/array.c @@ -37,14 +37,6 @@ memfill(register VALUE *mem, register long size, register VALUE val) } } -#define ARY_ITERLOCK FL_USER1 -static void -ary_iter_check(VALUE ary) -{ - if (FL_TEST(ary, ARY_ITERLOCK)) { - rb_raise(rb_eRuntimeError, "can't modify array during iteration"); - } -} #define ARY_SORTLOCK FL_USER3 #define ARY_SHARED_P(a) FL_TEST(a, ELTS_SHARED) @@ -58,11 +50,6 @@ ary_iter_check(VALUE ary) RARRAY(ary)->aux.capa = (capacity);\ } while (0) -#define ITERATE(func, ary) do { \ - FL_SET(ary, ARY_ITERLOCK); \ - return rb_ensure(func, (ary), each_unlock, (ary));\ -} while (0) - static inline void rb_ary_modify_check(VALUE ary) { @@ -307,7 +294,6 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary) VALUE size, val; rb_ary_modify(ary); - ary_iter_check(ary); if (rb_scan_args(argc, argv, "02", &size, &val) == 0) { if (RARRAY_PTR(ary) && !ARY_SHARED_P(ary)) { free(RARRAY(ary)->ptr); @@ -548,7 +534,6 @@ rb_ary_shift(VALUE ary) VALUE top; rb_ary_modify_check(ary); - ary_iter_check(ary); if (RARRAY_LEN(ary) == 0) return Qnil; top = RARRAY_PTR(ary)[0]; if (!ARY_SHARED_P(ary)) { @@ -594,7 +579,6 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary) } rb_ary_modify_check(ary); - ary_iter_check(ary); result = ary_shared_first(argc, argv, ary, Qfalse); n = RARRAY_LEN(result); if (ARY_SHARED_P(ary)) { @@ -628,7 +612,6 @@ rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary) if (argc == 0) return ary; rb_ary_modify(ary); - ary_iter_check(ary); if (RARRAY(ary)->aux.capa <= RARRAY_LEN(ary)+argc) { RESIZE_CAPA(ary, RARRAY(ary)->aux.capa + ARY_DEFAULT_SIZE); } @@ -995,7 +978,6 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl) rlen = RARRAY_LEN(rpl); } rb_ary_modify(ary); - ary_iter_check(ary); if (beg >= RARRAY_LEN(ary)) { len = beg + rlen; if (len >= ARY_CAPA(ary)) { @@ -1118,24 +1100,6 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary) return ary; } -static VALUE -each_unlock(VALUE ary) -{ - FL_UNSET(ary, ARY_ITERLOCK); - return ary; -} - -static VALUE -each_i(VALUE ary) -{ - long i; - - for (i=0; i array @@ -1153,19 +1117,12 @@ each_i(VALUE ary) VALUE rb_ary_each(VALUE ary) -{ - RETURN_ENUMERATOR(ary, 0, 0); - ITERATE(each_i, ary); - return ary; -} - -static VALUE -each_index_i(VALUE ary) { long i; + RETURN_ENUMERATOR(ary, 0, 0); for (i=0; i 1) { p1 = RARRAY_PTR(ary); p2 = p1 + RARRAY_LEN(ary) - 1; /* points last item */ @@ -1569,7 +1524,6 @@ VALUE rb_ary_sort_bang(VALUE ary) { rb_ary_modify(ary); - ary_iter_check(ary); if (RARRAY_LEN(ary) > 1) { FL_SET(ary, ARY_SORTLOCK); /* prohibit modification during sort */ rb_ensure(sort_i, ary, sort_unlock, ary); @@ -1602,19 +1556,6 @@ rb_ary_sort(VALUE ary) } -static VALUE -collect_i(VALUE ary) -{ - long i; - VALUE collect; - - collect = rb_ary_new2(RARRAY_LEN(ary)); - for (i = 0; i < RARRAY_LEN(ary); i++) { - rb_ary_push(collect, rb_yield(RARRAY_PTR(ary)[i])); - } - return collect; -} - /* * call-seq: * array.collect {|item| block } -> an_array @@ -1631,24 +1572,19 @@ collect_i(VALUE ary) static VALUE rb_ary_collect(VALUE ary) -{ - RETURN_ENUMERATOR(ary, 0, 0); - ITERATE(collect_i, ary); -} - - -static VALUE -collect_bang_i(VALUE ary) { long i; + VALUE collect; - rb_ary_modify(ary); + RETURN_ENUMERATOR(ary, 0, 0); + collect = rb_ary_new2(RARRAY_LEN(ary)); for (i = 0; i < RARRAY_LEN(ary); i++) { - RARRAY_PTR(ary)[i] = rb_yield(RARRAY_PTR(ary)[i]); + rb_ary_push(collect, rb_yield(RARRAY_PTR(ary)[i])); } - return ary; + return collect; } + /* * call-seq: * array.collect! {|item| block } -> array @@ -1666,8 +1602,14 @@ collect_bang_i(VALUE ary) static VALUE rb_ary_collect_bang(VALUE ary) { + long i; + RETURN_ENUMERATOR(ary, 0, 0); - ITERATE(collect_bang_i, ary); + rb_ary_modify(ary); + for (i = 0; i < RARRAY_LEN(ary); i++) { + rb_ary_store(ary, i, rb_yield(RARRAY_PTR(ary)[i])); + } + return ary; } VALUE @@ -1721,21 +1663,6 @@ rb_ary_values_at(int argc, VALUE *argv, VALUE ary) } -static VALUE -select_i(VALUE ary) -{ - VALUE result; - long i; - - result = rb_ary_new2(RARRAY_LEN(ary)); - for (i = 0; i < RARRAY_LEN(ary); i++) { - if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) { - rb_ary_push(result, rb_ary_elt(ary, i)); - } - } - return result; -} - /* * call-seq: * array.select {|item| block } -> an_array @@ -1751,8 +1678,17 @@ select_i(VALUE ary) static VALUE rb_ary_select(VALUE ary) { + VALUE result; + long i; + RETURN_ENUMERATOR(ary, 0, 0); - ITERATE(select_i, ary); + result = rb_ary_new2(RARRAY_LEN(ary)); + for (i = 0; i < RARRAY_LEN(ary); i++) { + if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) { + rb_ary_push(result, rb_ary_elt(ary, i)); + } + } + return result; } /* @@ -1794,7 +1730,6 @@ rb_ary_delete(VALUE ary, VALUE item) } rb_ary_modify(ary); - ary_iter_check(ary); if (RARRAY_LEN(ary) > i2) { RARRAY(ary)->len = i2; if (i2 * 2 < ARY_CAPA(ary) && @@ -1819,7 +1754,6 @@ rb_ary_delete_at(VALUE ary, long pos) } rb_ary_modify(ary); - ary_iter_check(ary); del = RARRAY_PTR(ary)[pos]; MEMMOVE(RARRAY_PTR(ary)+pos, RARRAY_PTR(ary)+pos+1, VALUE, RARRAY_LEN(ary)-pos-1); @@ -1909,11 +1843,22 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary) return rb_ary_delete_at(ary, NUM2LONG(arg1)); } +/* + * call-seq: + * array.reject! {|item| block } -> array or nil + * + * Equivalent to Array#delete_if, deleting elements from + * _self_ for which the block evaluates to true, but returns + * nil if no changes were made. Also see + * Enumerable#reject. + */ + static VALUE -reject_bang_i(VALUE ary) +rb_ary_reject_bang(VALUE ary) { long i1, i2; + RETURN_ENUMERATOR(ary, 0, 0); rb_ary_modify(ary); for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) { VALUE v = RARRAY_PTR(ary)[i1]; @@ -1930,24 +1875,6 @@ reject_bang_i(VALUE ary) return ary; } -/* - * call-seq: - * array.reject! {|item| block } -> array or nil - * - * Equivalent to Array#delete_if, deleting elements from - * _self_ for which the block evaluates to true, but returns - * nil if no changes were made. Also see - * Enumerable#reject. - */ - -static VALUE -rb_ary_reject_bang(VALUE ary) -{ - RETURN_ENUMERATOR(ary, 0, 0); - ary_iter_check(ary); - ITERATE(reject_bang_i, ary); -} - /* * call-seq: * array.reject {|item| block } -> an_array @@ -2120,7 +2047,6 @@ rb_ary_replace(VALUE copy, VALUE orig) orig = to_ary(orig); rb_ary_modify_check(copy); - ary_iter_check(copy); if (copy == orig) return copy; shared = ary_make_shared(orig); if (!ARY_SHARED_P(copy)) { @@ -2149,7 +2075,6 @@ VALUE rb_ary_clear(VALUE ary) { rb_ary_modify(ary); - ary_iter_check(ary); RARRAY(ary)->len = 0; if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) { RESIZE_CAPA(ary, ARY_DEFAULT_SIZE * 2); @@ -2218,7 +2143,6 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary) break; } rb_ary_modify(ary); - ary_iter_check(ary); end = beg + len; if (end < 0) { rb_raise(rb_eArgError, "argument too big"); @@ -2712,7 +2636,6 @@ rb_ary_uniq_bang(VALUE ary) VALUE hash, v, vv; long i, j; - ary_iter_check(ary); hash = ary_make_hash(ary, 0); if (RARRAY_LEN(ary) == RHASH_SIZE(hash)) { @@ -2765,7 +2688,6 @@ rb_ary_compact_bang(VALUE ary) long n; rb_ary_modify(ary); - ary_iter_check(ary); p = t = RARRAY_PTR(ary); end = p + RARRAY_LEN(ary); @@ -2971,7 +2893,6 @@ rb_ary_shuffle_bang(VALUE ary) long i = RARRAY_LEN(ary); rb_ary_modify(ary); - ary_iter_check(ary); while (i) { long j = rb_genrand_real()*i; VALUE tmp = RARRAY_PTR(ary)[--i];