summaryrefslogtreecommitdiff
path: root/test/psych/test_tainted.rb
AgeCommit message (Collapse)Author
2011-05-31Fixes a mistake in merge of r31812.yugui
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-30merges r31317 from trunk into ruby_1_9_2.yugui
-- * ext/psych/parser.c (parse): strings from psych have proper taint markings. * test/psych/test_tainted.rb: test for string taint git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e