* 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/.

* variable.c (fc_i): removed vast string allocation.


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

1 files changed, 1 insertions, 15 deletions

diff --git a/regex.c b/regex.c
index a3d8e2c243..9033e0ac81 100644
--- a/regex.c
+++ b/regex.c
@@ -2360,21 +2360,7 @@ re_compile_pattern(pattern, size, bufp)
 
       laststart++;
       EXTRACT_NUMBER_AND_INCR(mcnt, laststart);
-      if (mcnt == 4 && *laststart == anychar) {
-	switch ((enum regexpcode)laststart[1]) {
-	case jump_n:
-	case finalize_jump:
-	case maybe_finalize_jump:
-	case jump:
-	case jump_past_alt:
-	case dummy_failure_jump:
-	  bufp->options |= RE_OPTIMIZE_ANCHOR;
-	  break;
-	default:
-	  break;
-	}
-      }
-      else if (*laststart == charset || *laststart == charset_not) {
+      if (*laststart == charset || *laststart == charset_not) {
 	p0 = laststart;
 	mcnt = *++p0;
 	p0 += mcnt+1;