* hash.c (ruby_setenv): readline library leaves their environment

  strings uncopied.  "free" check revised.

* st.c (numhash): should shuffle bits by dividing by prime number.


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

1 files changed, 13 insertions, 8 deletions

diff --git a/eval.c b/eval.c
index 6756111f1c..ad0de6a38d 100644
--- a/eval.c
+++ b/eval.c
@@ -5400,17 +5400,22 @@ rb_f_require(obj, fname)
 
   load_dyna:
     rb_provide(feature);
+    {
+	int old_vmode = scope_vmode;
 
-    PUSH_TAG(PROT_NONE);
-    if ((state = EXEC_TAG()) == 0) {
-	void *handle;
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    void *handle;
 
-	load = rb_str_new2(file);
-	file = RSTRING(load)->ptr;
-	handle = dln_load(file);
-	rb_ary_push(ruby_dln_librefs, INT2NUM((long)handle));
+	    SCOPE_SET(SCOPE_PUBLIC);
+	    load = rb_str_new2(file);
+	    file = RSTRING(load)->ptr;
+	    handle = dln_load(file);
+	    rb_ary_push(ruby_dln_librefs, INT2NUM((long)handle));
+	}
+	POP_TAG();
+	SCOPE_SET(old_vmode);
     }
-    POP_TAG();
     if (state) JUMP_TAG(state);
 
     return Qtrue;