naruse	2010-10-12 19:09:31 +0900 (Tue, 12 Oct 2010)

  New Revision: 29455

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29455

  Log:
    * error.c (syserr_initialize): taint message if mesg is given
      and it is tainted.

  Modified files:
    trunk/ChangeLog
    trunk/error.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29454)
+++ ChangeLog	(revision 29455)
@@ -1,3 +1,8 @@
+Tue Oct 12 19:07:55 2010  NARUSE, Yui  <naruse@r...>
+
+	* error.c (syserr_initialize): taint message if mesg is given
+	  and it is tainted.
+
 Tue Oct 12 18:25:43 2010  NARUSE, Yui  <naruse@r...>
 
 	* io.c (rb_io_ungetc): always see Bignum. On 32bit valid value
Index: error.c
===================================================================
--- error.c	(revision 29454)
+++ error.c	(revision 29455)
@@ -1059,6 +1059,7 @@
 	    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 {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/