From 49af9012a20a824542cf588e55e5488895553e09 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 23 Sep 2021 16:02:44 +0900 Subject: Prohibit invalid encoding symbols [Bug #18184] --- test/ruby/test_marshal.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index 9eea3c272e..58831f3709 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -814,9 +814,13 @@ class TestMarshal < Test::Unit::TestCase assert_raise(ArgumentError, /\(given 1, expected 0\)/) { ruby2_keywords_test(*[hash2]) } - hash2 = Marshal.load(data.sub(/:\x06K(?=T\z)/, "I\\&\x06:\x0dencoding\"\x0dUTF-16LE")) - assert_raise(ArgumentError, /\(given 1, expected 0\)/) { - ruby2_keywords_test(*[hash2]) + end + + def test_invalid_byte_sequence_symbol + data = Marshal.dump(:K) + data = data.sub(/:\x06K/, "I\\&\x06:\x0dencoding\"\x0dUTF-16LE") + assert_raise(ArgumentError, /UTF-16LE: "\\x4B"/) { + Marshal.load(data) } end -- cgit v1.2.3