mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
pack.c: fix underflow
* pack.c (pack_unpack_internal): get rid of underflow. https://hackerone.com/reports/298246 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
8794dec6a5
commit
d02b7bd864
2 changed files with 4 additions and 1 deletions
2
pack.c
2
pack.c
|
@ -1128,7 +1128,7 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode)
|
|||
else if (ISDIGIT(*p)) {
|
||||
errno = 0;
|
||||
len = STRTOUL(p, (char**)&p, 10);
|
||||
if (errno) {
|
||||
if (len < 0 || errno) {
|
||||
rb_raise(rb_eRangeError, "pack length too big");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -550,6 +550,9 @@ class TestPack < Test::Unit::TestCase
|
|||
assert_equal([1, 2], "\x01\x00\x00\x02".unpack("C@3C"))
|
||||
assert_equal([nil], "\x00".unpack("@1C")) # is it OK?
|
||||
assert_raise(ArgumentError) { "\x00".unpack("@2C") }
|
||||
|
||||
pos = RbConfig::LIMITS["UINTPTR_MAX"] - 99 # -100
|
||||
assert_raise(RangeError) {"0123456789".unpack("@#{pos}C10")}
|
||||
end
|
||||
|
||||
def test_pack_unpack_percent
|
||||
|
|
Loading…
Reference in a new issue