From f1edc864417da010e0c8d671e44130562702f765 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Jan 2009 09:23:30 +0000 Subject: merges r21780 from trunk into ruby_1_9_1. * array.c (rb_ary_aset): fixed arguments evaluation order. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ array.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 467e6b36b8..082a5dc075 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Jan 26 16:00:40 2009 Nobuyoshi Nakada + + * array.c (rb_ary_aset): fixed arguments evaluation order. + Sun Jan 25 12:02:56 2009 Nobuyoshi Nakada * win32/Makefile.sub (clean-ext): condition of EXTS was inverted. diff --git a/array.c b/array.c index 3994ce6e0d..fb92c0f0ba 100644 --- a/array.c +++ b/array.c @@ -1264,7 +1264,9 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary) long offset, beg, len; if (argc == 3) { - rb_ary_splice(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]); + beg = NUM2LONG(argv[0]); + len = NUM2LONG(argv[1]); + rb_ary_splice(ary, beg, len, argv[2]); return argv[2]; } if (argc != 2) { -- cgit v1.2.3