diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-12 10:09:31 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-12 10:09:31 +0000 |
commit | 628c802eae8cb2807c283f2bab2ca7bcb115ecdd (patch) | |
tree | 4a68aeadf50621ad873bd43188bf7a1a8215f105 | |
parent | b487f7881fd220a13313ebeb3968f17d45bb2b23 (diff) |
* error.c (syserr_initialize): taint message if mesg is given
and it is tainted.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | error.c | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Oct 12 19:07:55 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * error.c (syserr_initialize): taint message if mesg is given + and it is tainted. + Tue Oct 12 18:25:43 2010 NARUSE, Yui <naruse@ruby-lang.org> * io.c (rb_io_ungetc): always see Bignum. On 32bit valid value @@ -1059,6 +1059,7 @@ syserr_initialize(int argc, VALUE *argv, VALUE self) if (le != me && rb_enc_asciicompat(me)) le = me; }/* else assume err is non ASCII string. */ + if (OBJ_TAINTED(str)) OBJ_TAINT(mesg); rb_enc_associate(mesg, le); } else { |