1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check the encoding of ruby2_keywords_flag [Bug #18184]

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2021-09-23 00:04:14 +09:00
parent 357406da8b
commit 552728a23a
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
marshal.c
View File

@ -1422,6 +1422,7 @@ ruby2_keywords_flag_check(VALUE sym)
{ {
const char *p; const char *p;
long l; long l;
if (rb_enc_get_index(sym) != ENCINDEX_US_ASCII) return 0;
RSTRING_GETMEM(sym, p, l); RSTRING_GETMEM(sym, p, l);
if (l <= 0) return 0; if (l <= 0) return 0;
if (name_equal(name_s_ruby2_keywords_flag, rb_strlen_lit(name_s_ruby2_keywords_flag), p, l)) { if (name_equal(name_s_ruby2_keywords_flag, rb_strlen_lit(name_s_ruby2_keywords_flag), p, l)) {

6
test/ruby/test_marshal.rb
View File

@ -810,7 +810,11 @@ class TestMarshal < Test::Unit::TestCase
hash = Marshal.load(data) hash = Marshal.load(data)
assert_equal(42, ruby2_keywords_test(*[hash])) assert_equal(42, ruby2_keywords_test(*[hash]))
hash2 = Marshal.load(data.sub!(/\x06K(?=T\z)/, "\x08KEY")) hash2 = Marshal.load(data.sub(/\x06K(?=T\z)/, "\x08KEY"))
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\)/) { assert_raise(ArgumentError, /\(given 1, expected 0\)/) {
ruby2_keywords_test(*[hash2]) ruby2_keywords_test(*[hash2])
} }