archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 39594,39596: [Backport #8010]

Browse source 
* enumerator.c (enumerator_with_index_i): allow Bignum as offset, to
	  get rid of conversion exception and integer overflow.
	  [ruby-dev:47131] [Bug #8010]

	* enumerator.c (enumerator_with_index):  Restore handling of a nil memo
	  from r39594.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-12-02 14:29:37 +00:00
parent 83c337f29a
commit b851418bb7
6 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Dec 2 23:16:50 2013 Eric Hodel <drbrain@segment7.net>
* enumerator.c (enumerator_with_index): Restore handling of a nil memo
from r39594.
Mon Dec 2 22:53:05 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_readlink): fix buffer overflow on a long symlink. since

9
enumerator.c
View file

@ -460,11 +460,9 @@ enumerator_each(int argc, VALUE *argv, VALUE obj)
static VALUE
enumerator_with_index_i(VALUE val, VALUE m, int argc, VALUE *argv)
{
VALUE idx;
VALUE *memo = (VALUE *)m;
idx = INT2FIX(*memo);
++*memo;
VALUE idx = *memo;
*memo = rb_int_succ(idx);
if (argc <= 1)
return rb_yield_values(2, val, idx);
@ -494,7 +492,8 @@ enumerator_with_index(int argc, VALUE *argv, VALUE obj)
rb_scan_args(argc, argv, "01", &memo);
RETURN_SIZED_ENUMERATOR(obj, argc, argv, enumerator_size);
memo = NIL_P(memo) ? 0 : (VALUE)NUM2LONG(memo);
if (NIL_P(memo))
memo = INT2NUM(0);
return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)&memo);
}

2
internal.h
View file

@ -178,6 +178,8 @@ VALUE num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl);
int ruby_float_step(VALUE from, VALUE to, VALUE step, int excl);
double ruby_float_mod(double x, double y);
int rb_num_negative_p(VALUE);
VALUE rb_int_succ(VALUE num);
VALUE rb_int_pred(VALUE num);
/* object.c */
VALUE rb_obj_equal(VALUE obj1, VALUE obj2);

12
numeric.c
View file

@ -2383,8 +2383,8 @@ fix_succ(VALUE num)
* (-1).next #=> 0
*/
static VALUE
int_succ(VALUE num)
VALUE
rb_int_succ(VALUE num)
{
if (FIXNUM_P(num)) {
long i = FIX2LONG(num) + 1;
@ -2393,6 +2393,8 @@ int_succ(VALUE num)
return rb_funcall(num, '+', 1, INT2FIX(1));
}
#define int_succ rb_int_succ
/*
* call-seq:
* int.pred -> integer
@ -2403,8 +2405,8 @@ int_succ(VALUE num)
* (-1).pred #=> -2
*/
static VALUE
int_pred(VALUE num)
VALUE
rb_int_pred(VALUE num)
{
if (FIXNUM_P(num)) {
long i = FIX2LONG(num) - 1;
@ -2413,6 +2415,8 @@ int_pred(VALUE num)
return rb_funcall(num, '-', 1, INT2FIX(1));
}
#define int_pred rb_int_pred
VALUE
rb_enc_uint_chr(unsigned int code, rb_encoding *enc)
{

8
test/ruby/test_enumerator.rb
View file

@ -104,6 +104,14 @@ class TestEnumerator < Test::Unit::TestCase
assert_equal([[1,5],[2,6],[3,7]], @obj.to_enum(:foo, 1, 2, 3).with_index(5).to_a)
end
def test_with_index_large_offset
bug8010 = '[ruby-dev:47131] [Bug #8010]'
s = 1 << (8*1.size-2)
assert_equal([[1,s],[2,s+1],[3,s+2]], @obj.to_enum(:foo, 1, 2, 3).with_index(s).to_a, bug8010)
s <<= 1
assert_equal([[1,s],[2,s+1],[3,s+2]], @obj.to_enum(:foo, 1, 2, 3).with_index(s).to_a, bug8010)
end
def test_with_object
obj = [0, 1]
ret = (1..10).each.with_object(obj) {|i, memo|

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-12-02"
#define RUBY_PATCHLEVEL 355
#define RUBY_PATCHLEVEL 356
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 12