* eval.c (rb_f_require): move rb_file_s_expand_path from

  rb_find_file_noext().

* file.c (rb_find_file_noext): move rb_file_s_expand_path to
  rb_f_require().

* string.c (rb_str_each_line): should propagate taint mark.

* ext/nkf/nkf.c (rb_nkf_kconv): ditto.

* ruby.c (load_file): local variables 'c' remain uninitialized on
  xflag.

* regex.c (re_match): prefetched escaped character too early.

* eval.c (rb_call0): add argument check for attr_readers.


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

1 files changed, 1 insertions, 1 deletions

diff --git a/regex.c b/regex.c
index fc4b7253e6..e9689cb4b8 100644
--- a/regex.c
+++ b/regex.c
@@ -4237,7 +4237,6 @@ re_match(bufp, string_arg, size, pos, regs)
 	    unsigned char c;
 
 	    PREFETCH;
-	    c = *d++;
 	    if (*p == 0xff) {
 	      p++;  
 	      if (!--mcnt
@@ -4246,6 +4245,7 @@ re_match(bufp, string_arg, size, pos, regs)
 		goto fail;
 	      continue;
 	    }
+	    c = *d++;
 	    if (ismbchar(c)) {
 	      int n;