diff options
Diffstat (limited to 'array.c')
| -rw-r--r-- | array.c | 23 |
1 files changed, 13 insertions, 10 deletions
@@ -110,7 +110,7 @@ ary_new(klass, len) if (len < 0) { rb_raise(rb_eArgError, "negative array size (or size too big)"); } - if (len > 0 && len * sizeof(VALUE) <= 0) { + if (len > 0 && len * sizeof(VALUE) <= len) { rb_raise(rb_eArgError, "array size too big"); } if (len == 0) len++; @@ -236,7 +236,7 @@ rb_ary_initialize(argc, argv, ary) if (len < 0) { rb_raise(rb_eArgError, "negative array size"); } - if (len > 0 && len * sizeof(VALUE) <= 0) { + if (len > 0 && len * (long)sizeof(VALUE) <= len) { rb_raise(rb_eArgError, "array size too big"); } if (len > RARRAY(ary)->aux.capa) { @@ -304,7 +304,7 @@ rb_ary_store(ary, idx, val) new_capa = ARY_DEFAULT_SIZE; } new_capa += idx; - if (new_capa > new_capa * (long)sizeof(VALUE)) { + if (new_capa * (long)sizeof(VALUE) <= new_capa) { rb_raise(rb_eArgError, "index too big"); } RARRAY(ary)->aux.capa = new_capa; @@ -1085,19 +1085,22 @@ sort_1(a, b) } static int -sort_2(a, b) - VALUE *a, *b; +sort_2(ap, bp) + VALUE *ap, *bp; { VALUE retval; + VALUE a = *ap, b = *ap; - if (FIXNUM_P(*a) && FIXNUM_P(*b)) { - return *a - *b; + if (FIXNUM_P(a) && FIXNUM_P(b)) { + if (a > b) return INT2FIX(1); + if (a < b) return INT2FIX(-1); + return INT2FIX(0); } - if (TYPE(*a) == T_STRING && TYPE(*b) == T_STRING) { - return rb_str_cmp(*a, *b); + if (TYPE(a) == T_STRING && TYPE(b) == T_STRING) { + return rb_str_cmp(a, b); } - retval = rb_funcall(*a, id_cmp, 1, *b); + retval = rb_funcall(a, id_cmp, 1, b); return rb_cmpint(retval); } |