* eval.c (rb_thread_cleanup): should not modify the global

  variable curr_thread.

* re.c (rb_reg_initialize_m): frozen check should be moved here
  from rb_reg_initialize().


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

1 files changed, 3 insertions, 3 deletions

diff --git a/re.c b/re.c
index 5c9a858a70..8eeab0cb21 100644
--- a/re.c
+++ b/re.c
@@ -833,9 +833,6 @@ rb_reg_initialize(obj, s, len, options)
 {
     struct RRegexp *re = RREGEXP(obj);
 
-    if (OBJ_FROZEN(obj)) {
-	rb_error_frozen("Regexp");
-    }
     if (re->ptr) re_free_pattern(re->ptr);
     if (re->str) free(re->str);
     re->ptr = 0;
@@ -1023,6 +1020,9 @@ rb_reg_initialize_m(argc, argv, self)
 	}
     }
 
+    if (OBJ_FROZEN(self)) {
+	rb_error_frozen("Regexp");
+    }
     src = argv[0];
     if (TYPE(src) == T_REGEXP) {
 	rb_reg_check(src);