matz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e29737df9c..b9e1398093 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@ Wed Aug  9 13:24:25 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
 Mon Aug  7 13:59:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
+	* 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>
diff --git a/ruby.h b/ruby.h
index a3170a8ed9..1597a43ab3 100644
--- a/ruby.h
+++ b/ruby.h
@@ -199,8 +199,8 @@ char *rb_str2cstr _((VALUE,int*));
 VALUE rb_newobj _((void));
 #define NEWOBJ(obj,type) type *obj = (type*)rb_newobj()
 #define OBJSETUP(obj,c,t) {\
-    RBASIC(obj)->klass = (c);\
     RBASIC(obj)->flags = (t);\
+    RBASIC(obj)->klass = (c);\
     if (rb_safe_level() >= 3) FL_SET(obj, FL_TAINT);\
 }
 #define CLONESETUP(clone,obj) do {\