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

use RSTRUCT_CONST_PTR carefully.

Browse source 
* struct.c: should not use `RSTRUCT_CONST_PTR` with method dispatch
  because pointers can be obsolete after method dispatch. `rb_equal()`
  and so on can dispatch Ruby's methods.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2018-11-05 08:02:29 +00:00
parent 972cf8c91e
commit 05711c45af
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
struct.c
View file

@ -1135,15 +1135,12 @@ rb_struct_select(int argc, VALUE *argv, VALUE s)
static VALUE static VALUE
recursive_equal(VALUE s, VALUE s2, int recur) recursive_equal(VALUE s, VALUE s2, int recur)
{ {
const VALUE *ptr, *ptr2;
long i, len; long i, len;
if (recur) return Qtrue; /* Subtle! */ if (recur) return Qtrue; /* Subtle! */
ptr = RSTRUCT_CONST_PTR(s);
ptr2 = RSTRUCT_CONST_PTR(s2);
len = RSTRUCT_LEN(s); len = RSTRUCT_LEN(s);
for (i=0; i<len; i++) { for (i=0; i<len; i++) {
if (!rb_equal(ptr[i], ptr2[i])) return Qfalse; if (!rb_equal(RSTRUCT_GET(s, i), RSTRUCT_GET(s2, i))) return Qfalse;
} }
return Qtrue; return Qtrue;
} }
@ -1191,13 +1188,11 @@ rb_struct_hash(VALUE s)
long i, len; long i, len;
st_index_t h; st_index_t h;
VALUE n; VALUE n;
const VALUE *ptr;
h = rb_hash_start(rb_hash(rb_obj_class(s))); h = rb_hash_start(rb_hash(rb_obj_class(s)));
ptr = RSTRUCT_CONST_PTR(s);
len = RSTRUCT_LEN(s); len = RSTRUCT_LEN(s);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
n = rb_hash(ptr[i]); n = rb_hash(RSTRUCT_GET(s, i));
h = rb_hash_uint(h, NUM2LONG(n)); h = rb_hash_uint(h, NUM2LONG(n));
} }
h = rb_hash_end(h); h = rb_hash_end(h);
@ -1207,15 +1202,12 @@ rb_struct_hash(VALUE s)
static VALUE static VALUE
recursive_eql(VALUE s, VALUE s2, int recur) recursive_eql(VALUE s, VALUE s2, int recur)
{ {
const VALUE *ptr, *ptr2;
long i, len; long i, len;
if (recur) return Qtrue; /* Subtle! */ if (recur) return Qtrue; /* Subtle! */
ptr = RSTRUCT_CONST_PTR(s);
ptr2 = RSTRUCT_CONST_PTR(s2);
len = RSTRUCT_LEN(s); len = RSTRUCT_LEN(s);
for (i=0; i<len; i++) { for (i=0; i<len; i++) {
if (!rb_eql(ptr[i], ptr2[i])) return Qfalse; if (!rb_eql(RSTRUCT_GET(s, i), RSTRUCT_GET(s2, i))) return Qfalse;
} }
return Qtrue; return Qtrue;
} }