diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-07-06 06:37:01 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-07-06 06:37:01 +0000 |
| commit | 95ad43eeb5d967d61be874e5700ee6d8667bf660 (patch) | |
| tree | be539344ea68014b792caf7b9a44d6934fe1bbb7 /ext | |
| parent | 88f586b8ac7ccc3154753529b99048bf1abb2d9e (diff) | |
* 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
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/nkf/nkf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index b59688cb03..51a28f7c0b 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -80,6 +80,8 @@ rb_nkf_kconv(obj, opt, src) kanji_convert(NULL); RSTRING(dst)->ptr[output_ctr] = '\0'; RSTRING(dst)->len = output_ctr; + if(OBJ_TAINTED(src)) + OBJ_TAINT(dst); return dst; } |