diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | gc.c | 3 | ||||
| -rw-r--r-- | ruby.h | 3 |
3 files changed, 7 insertions, 2 deletions
@@ -1,5 +1,8 @@ Mon Aug 7 13:59:12 2000 Yukihiro Matsumoto <matz@ruby-lang.org> + * ruby.h (CLONESETUP): should copy flags before any potential + object allocation. + * regex.c (re_match): check for stack depth was needed. Sat Aug 5 16:43:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp> @@ -280,6 +280,7 @@ rb_newobj() if (!freelist) rb_gc(); + if (freelist->as.free.next && freelist->as.free.next->as.free.flag != 0) abort(); obj = (VALUE)freelist; freelist = freelist->as.free.next; return obj; @@ -665,7 +666,7 @@ gc_sweep() if (p->as.basic.flags) { obj_free((VALUE)p); } - if (need_call_final && FL_TEST(p, FL_FINALIZE)) { + if (need_call_final && FL_TEST(p, FL_FINALIZE)) { p->as.free.flag = FL_MARK; /* remain marked */ p->as.free.next = final_list; final_list = p; @@ -222,7 +222,8 @@ VALUE rb_newobj _((void)); if (rb_safe_level() >= 3) FL_SET(obj, FL_TAINT);\ } #define CLONESETUP(clone,obj) do {\ - OBJSETUP(clone,rb_singleton_class_clone(RBASIC(obj)->klass),RBASIC(obj)->flags);\ + RBASIC(clone)->flags = (RBASIC(obj)->flags);\ + RBASIC(obj)->klass = (rb_singleton_class_clone(RBASIC(obj)->klass));\ rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);\ if (FL_TEST(obj, FL_EXIVAR)) rb_clone_generic_ivar((VALUE)clone,(VALUE)obj);\ } while (0) |