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

* eval_method.c (rb_get_method_body): ent->method may be freed by

Browse Source 
GC.  [ruby-dev:31819]

* thread.c (remove_event_hook): should not access freed memory.
  [ruby-dev:31820]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-03-01 03:36:33 +00:00
parent 32c4aa1d14
commit 207b8292ba
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sat Mar 1 12:15:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval_method.c (rb_get_method_body): ent->method may be freed by
GC. [ruby-dev:31819]
* thread.c (remove_event_hook): should not access freed memory.
[ruby-dev:31820]
Sat Mar 01 10:31:19 2008 NARUSE, Yui <naruse@ruby-lang.org> Sat Mar 01 10:31:19 2008 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (read_all, rb_io_getline_fast): encoding is io_input_encoding. * io.c (read_all, rb_io_getline_fast): encoding is io_input_encoding.

5
bootstraptest/test_knownbug.rb
View File

@ -29,11 +29,6 @@ assert_equal 'ok', %q{
C.new.foo C.new.foo
}, '[ruby-core:14813]' }, '[ruby-core:14813]'
# test is not written...
flunk '[ruby-dev:31819] rb_clear_cache_by_class'
flunk '[ruby-dev:31820] valgrind set_trace_func'
flunk '[ruby-dev:32746] Invalid read of size 1'
assert_equal 'ok', %q{ assert_equal 'ok', %q{
class X < RuntimeError;end class X < RuntimeError;end
x = [X] x = [X]

8
eval_method.c
View File

@ -11,6 +11,7 @@ struct cache_entry { /* method hash table. */
ID mid; /* method's id */ ID mid; /* method's id */
ID mid0; /* method's original id */ ID mid0; /* method's original id */
VALUE klass; /* receiver's class */ VALUE klass; /* receiver's class */
VALUE oklass; /* original's class */
NODE *method; NODE *method;
}; };
@ -46,7 +47,7 @@ rb_clear_cache_for_undef(VALUE klass, ID id)
ent = cache; ent = cache;
end = ent + CACHE_SIZE; end = ent + CACHE_SIZE;
while (ent < end) { while (ent < end) {
if (ent->method && ent->method->nd_clss == klass && ent->mid == id) { if (ent->oklass == klass && ent->mid == id) {
ent->mid = 0; ent->mid = 0;
} }
ent++; ent++;
@ -84,8 +85,7 @@ rb_clear_cache_by_class(VALUE klass)
ent = cache; ent = cache;
end = ent + CACHE_SIZE; end = ent + CACHE_SIZE;
while (ent < end) { while (ent < end) {
if ((ent->klass == klass) || if (ent->klass == klass || ent->oklass == klass) {
(ent->method && ent->method->nd_clss == klass)) {
ent->mid = 0; ent->mid = 0;
} }
ent++; ent++;
@ -250,6 +250,7 @@ rb_get_method_body(VALUE klass, ID id, ID *idp)
ent->klass = klass; ent->klass = klass;
ent->mid = ent->mid0 = id; ent->mid = ent->mid0 = id;
ent->method = 0; ent->method = 0;
ent->oklass = 0;
return 0; return 0;
} }
@ -263,6 +264,7 @@ rb_get_method_body(VALUE klass, ID id, ID *idp)
ent->mid = id; ent->mid = id;
ent->mid0 = fbody->nd_oid; ent->mid0 = fbody->nd_oid;
ent->method = body = method; ent->method = body = method;
ent->oklass = method->nd_clss;
} }
else { else {
body = method; body = method;

7
thread.c
View File

@ -2757,9 +2757,10 @@ rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data)
static int static int
remove_event_hook(rb_event_hook_t **root, rb_event_hook_func_t func) remove_event_hook(rb_event_hook_t **root, rb_event_hook_func_t func)
{ {
rb_event_hook_t *prev = NULL, *hook = *root; rb_event_hook_t *prev = NULL, *hook = *root, *next;
while (hook) { while (hook) {
next = hook->next;
if (func == 0 || hook->func == func) { if (func == 0 || hook->func == func) {
if (prev) { if (prev) {
prev->next = hook->next; prev->next = hook->next;
@ -2769,8 +2770,10 @@ remove_event_hook(rb_event_hook_t **root, rb_event_hook_func_t func)
} }
xfree(hook); xfree(hook);
} }
else {
prev = hook; prev = hook;
hook = hook->next; }
hook = next;
} }
return -1; return -1;
} }