* eval.c (rb_load): should check if tainted even when wrap is

  specified.

* regex.c (re_compile_pattern): too much optimization for the
  cases like /(.|a)b/.


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

1 files changed, 1 insertions, 6 deletions

diff --git a/eval.c b/eval.c
index c4d298421c..a1df116c1a 100644
--- a/eval.c
+++ b/eval.c
@@ -5167,12 +5167,7 @@ rb_load(fname, wrap)
     NODE *saved_cref = ruby_cref;
     TMP_PROTECT;
 
-    if (wrap) {
-	StringValue(fname);
-    }
-    else {
-	SafeStringValue(fname);
-    }
+    SafeStringValue(fname);
     file = rb_find_file(RSTRING(fname)->ptr);
     if (!file) {
 	rb_raise(rb_eLoadError, "No such file to load -- %s", RSTRING(fname)->ptr);