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

[Bug #19108] Check for the encoding of pack/unpack format

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2022-11-22 14:25:44 +09:00
parent a1d341efaf
commit 9869bd1d61
Notes: git 2022-12-01 08:38:52 +00:00 
Merged: https://github.com/ruby/ruby/pull/6785
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pack.c
View File

@ -208,6 +208,7 @@ pack_pack(rb_execution_context_t *ec, VALUE ary, VALUE fmt, VALUE buffer)
int integer_size, bigendian_p;
StringValue(fmt);
rb_must_asciicompat(fmt);
p = RSTRING_PTR(fmt);
pend = p + RSTRING_LEN(fmt);
@ -959,6 +960,7 @@ pack_unpack_internal(VALUE str, VALUE fmt, enum unpack_mode mode, long offset)
StringValue(str);
StringValue(fmt);
rb_must_asciicompat(fmt);
if (offset < 0) rb_raise(rb_eArgError, "offset can't be negative");
len = RSTRING_LEN(str);

14
test/ruby/test_pack.rb
View File

@ -22,6 +22,20 @@ class TestPack < Test::Unit::TestCase
assert_equal(x, x.pack("l").unpack("l"))
end
def test_ascii_incompatible
assert_raise(Encoding::CompatibilityError) do
["foo"].pack("u".encode("UTF-32BE"))
end
assert_raise(Encoding::CompatibilityError) do
"foo".unpack("C".encode("UTF-32BE"))
end
assert_raise(Encoding::CompatibilityError) do
"foo".unpack1("C".encode("UTF-32BE"))
end
end
def test_pack_n
assert_equal "\000\000", [0].pack('n')
assert_equal "\000\001", [1].pack('n')