* eval.c (rb_require_safe): prevent extension from loading twice.

  fixed: [ruby-dev:29523]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 7 deletions

diff --git a/eval.c b/eval.c
index 4eeba6f84..fb0160aa9 100644
--- a/eval.c
+++ b/eval.c
@@ -7153,15 +7153,15 @@ rb_require_safe(fname, safe)
 	    }
 	    else {
 		ruby_safe_level = 0;
+		/* loading ruby library should be serialized. */
+		if (!loading_tbl) {
+		    loading_tbl = st_init_strtable();
+		}
+		/* partial state */
+		ftptr = ruby_strdup(RSTRING_PTR(feature));
+		st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread);
 		switch (found) {
 		  case 'r':
-		    /* loading ruby library should be serialized. */
-		    if (!loading_tbl) {
-			loading_tbl = st_init_strtable();
-		    }
-		    /* partial state */
-		    ftptr = ruby_strdup(RSTRING(feature)->ptr);
-		    st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread);
 		    rb_load(path, 0);
 		    break;