kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* vm_insnhelper.c: attr_writer should return its argument [Bug #7773]

Browse source 
* 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
This commit is contained in:
marcandre 2013-02-06 17:31:22 +00:00
parent 4f74d59be9
commit 6851ad4756
3 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Thu Feb 7 01:35:00 2013 Zachary Scott <zachary@zacharyscott.net>
* doc/security.rdoc: Link to japanese version of CVE page patch by * doc/security.rdoc: Link to japanese version of CVE page patch by

13
test/ruby/test_basicinstructions.rb
View file

@ -502,6 +502,7 @@ class TestBasicInstructions < Test::Unit::TestCase
class OP class OP
attr_reader :x attr_reader :x
attr_accessor :foo
def x=(x) def x=(x)
@x = x @x = x
:Bug1996 :Bug1996
@ -602,6 +603,17 @@ class TestBasicInstructions < Test::Unit::TestCase
assert_equal 4, x[0] assert_equal 4, x[0]
end 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 def test_backref
/re/ =~ 'not match' /re/ =~ 'not match'
assert_nil $~ assert_nil $~
@ -683,5 +695,4 @@ class TestBasicInstructions < Test::Unit::TestCase
assert_equal [], [*a] assert_equal [], [*a]
assert_equal [1], [1, *a] assert_equal [1], [1, *a]
end end
end end

10
vm_insnhelper.c
View file

@ -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); 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) vm_setivar(VALUE obj, ID id, VALUE val, IC ic, rb_call_info_t *ci, int is_attr)
{ {
#if USE_IC_FOR_IVAR #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) { if (index < len) {
ptr[index] = val; ptr[index] = val;
return; /* inline cache hit */ return val; /* inline cache hit */
} }
} }
else { 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 */ #endif /* USE_IC_FOR_IVAR */
rb_ivar_set(obj, id, val); return rb_ivar_set(obj, id, val);
} }
static VALUE 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 static VALUE
vm_call_attrset(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci) 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; cfp->sp -= 2;
return Qnil; return val;
} }
static inline VALUE static inline VALUE