diff options
| author | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-06 17:31:22 +0000 |
|---|---|---|
| committer | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-06 17:31:22 +0000 |
| commit | 6851ad4756b676fa114e17bc805bc92bb6656caa (patch) | |
| tree | ff94401e2f871a339697cc3af51b65f96ba87f86 | |
| parent | 4f74d59be995694a271b1a1a8e7bb45573db2c6d (diff) | |
* vm_insnhelper.c: attr_writer should return its argument [Bug #7773]
* test/ruby/test_basicinstructions.rb: Test for above
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_basicinstructions.rb | 13 | ||||
| -rw-r--r-- | vm_insnhelper.c | 10 |
3 files changed, 23 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Thu Feb 7 02:31:10 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + * vm_insnhelper.c: attr_writer should return its argument [Bug #7773] + + * test/ruby/test_basicinstructions.rb: Test for above + Thu Feb 7 01:35:00 2013 Zachary Scott <zachary@zacharyscott.net> * doc/security.rdoc: Link to japanese version of CVE page patch by diff --git a/test/ruby/test_basicinstructions.rb b/test/ruby/test_basicinstructions.rb index e93b339377..4aa164e0c4 100644 --- a/test/ruby/test_basicinstructions.rb +++ b/test/ruby/test_basicinstructions.rb @@ -502,6 +502,7 @@ class TestBasicInstructions < Test::Unit::TestCase class OP attr_reader :x + attr_accessor :foo def x=(x) @x = x :Bug1996 @@ -602,6 +603,17 @@ class TestBasicInstructions < Test::Unit::TestCase assert_equal 4, x[0] end + def test_send_opassing + bug7773 = '[ruby-core:51821]' + x = OP.new + assert_equal 42, x.foo = 42, bug7773 + assert_equal 42, x.foo, bug7773 + assert_equal -6, x.send(:foo=, -6), bug7773 + assert_equal -6, x.foo, bug7773 + assert_equal :Bug1996, x.send(:x=, :case_when_setter_returns_other_value), bug7773 + assert_equal :case_when_setter_returns_other_value, x.x, bug7773 + end + def test_backref /re/ =~ 'not match' assert_nil $~ @@ -683,5 +695,4 @@ class TestBasicInstructions < Test::Unit::TestCase assert_equal [], [*a] assert_equal [1], [1, *a] end - end diff --git a/vm_insnhelper.c b/vm_insnhelper.c index d82ffb3d1d..636cd39c2c 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -549,7 +549,7 @@ vm_getivar(VALUE obj, ID id, IC ic, rb_call_info_t *ci, int is_attr) return rb_ivar_get(obj, id); } -static inline void +static inline VALUE vm_setivar(VALUE obj, ID id, VALUE val, IC ic, rb_call_info_t *ci, int is_attr) { #if USE_IC_FOR_IVAR @@ -572,7 +572,7 @@ vm_setivar(VALUE obj, ID id, VALUE val, IC ic, rb_call_info_t *ci, int is_attr) if (index < len) { ptr[index] = val; - return; /* inline cache hit */ + return val; /* inline cache hit */ } } else { @@ -592,7 +592,7 @@ vm_setivar(VALUE obj, ID id, VALUE val, IC ic, rb_call_info_t *ci, int is_attr) } } #endif /* USE_IC_FOR_IVAR */ - rb_ivar_set(obj, id, val); + return rb_ivar_set(obj, id, val); } static VALUE @@ -1540,9 +1540,9 @@ vm_call_ivar(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci) static VALUE vm_call_attrset(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci) { - vm_setivar(ci->recv, ci->me->def->body.attr.id, *(cfp->sp - 1), 0, ci, 1); + VALUE val = vm_setivar(ci->recv, ci->me->def->body.attr.id, *(cfp->sp - 1), 0, ci, 1); cfp->sp -= 2; - return Qnil; + return val; } static inline VALUE |