1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* array.c (recursive_equal): fix not to make invalid pointers when

Browse Source 
self and other are resized to same size in #== of their elements.
  [ruby-dev:46373] [Feature #6177]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37438 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2012-11-03 03:21:47 +00:00
parent bd2024165c
commit c032c5bc9a
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Nov 3 12:18:35 2012 Masaki Matsushita <glass.saga@gmail.com>
* array.c (recursive_equal): fix not to make invalid pointers when
self and other are resized to same size in #== of their elements.
[ruby-dev:46373] [Feature #6177]
Sat Nov 3 12:06:15 2012 Kouhei Sutou <kou@cozmixng.org> Sat Nov 3 12:06:15 2012 Kouhei Sutou <kou@cozmixng.org>
* test/rexml/test_xml_declaration.rb (TestXmlDeclaration#test_*): * test/rexml/test_xml_declaration.rb (TestXmlDeclaration#test_*):

8
array.c
View File

@ -3269,18 +3269,20 @@ rb_ary_rassoc(VALUE ary, VALUE value)
static VALUE static VALUE
recursive_equal(VALUE ary1, VALUE ary2, int recur) recursive_equal(VALUE ary1, VALUE ary2, int recur)
{ {
long i; long i, len1;
VALUE *p1, *p2; VALUE *p1, *p2;
if (recur) return Qtrue; /* Subtle! */ if (recur) return Qtrue; /* Subtle! */
p1 = RARRAY_PTR(ary1); p1 = RARRAY_PTR(ary1);
p2 = RARRAY_PTR(ary2); p2 = RARRAY_PTR(ary2);
len1 = RARRAY_LEN(ary1);
for (i = 0; i < RARRAY_LEN(ary1); i++) { for (i = 0; i < len1; i++) {
if (*p1 != *p2) { if (*p1 != *p2) {
if (rb_equal(*p1, *p2)) { if (rb_equal(*p1, *p2)) {
if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) len1 = RARRAY_LEN(ary1);
if (len1 != RARRAY_LEN(ary2) || len1 < i)
return Qfalse; return Qfalse;
p1 = RARRAY_PTR(ary1) + i; p1 = RARRAY_PTR(ary1) + i;
p2 = RARRAY_PTR(ary2) + i; p2 = RARRAY_PTR(ary2) + i;