diff options
author | Yondon Fu <yondon.fu@gmail.com> | 2017-12-19 06:17:41 +0800 |
---|---|---|
committer | Yondon Fu <yondon.fu@gmail.com> | 2017-12-19 06:17:41 +0800 |
commit | 3857cdc267e3192697f561df0a0f827f65dfb6b5 (patch) | |
tree | 401c52c4972a68229ea283a394a0b0a5f3cfdc8e /rlp | |
parent | a5330fe0c569b75cb8a524f60f7e8dc06498262b (diff) | |
parent | fe070ab5c32702033489f1b9d1655ea1b894c29e (diff) | |
download | go-tangerine-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar go-tangerine-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.gz go-tangerine-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.bz2 go-tangerine-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.lz go-tangerine-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.xz go-tangerine-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.zst go-tangerine-3857cdc267e3192697f561df0a0f827f65dfb6b5.zip |
Merge branch 'master' into abi-offset-fixed-arrays
Diffstat (limited to 'rlp')
-rw-r--r-- | rlp/raw.go | 2 | ||||
-rw-r--r-- | rlp/raw_test.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/rlp/raw.go b/rlp/raw.go index 6bf1c1df8..2b3f328f6 100644 --- a/rlp/raw.go +++ b/rlp/raw.go @@ -98,7 +98,7 @@ func readKind(buf []byte) (k Kind, tagsize, contentsize uint64, err error) { tagsize = 1 contentsize = uint64(b - 0x80) // Reject strings that should've been single bytes. - if contentsize == 1 && buf[1] < 128 { + if contentsize == 1 && len(buf) > 1 && buf[1] < 128 { return 0, 0, 0, ErrCanonSize } case b < 0xC0: diff --git a/rlp/raw_test.go b/rlp/raw_test.go index bac09d8d4..2aad04210 100644 --- a/rlp/raw_test.go +++ b/rlp/raw_test.go @@ -96,6 +96,7 @@ func TestSplit(t *testing.T) { {input: "F90055", err: ErrCanonSize, rest: "F90055"}, {input: "FA0002FFFF", err: ErrCanonSize, rest: "FA0002FFFF"}, + {input: "81", err: ErrValueTooLarge, rest: "81"}, {input: "8501010101", err: ErrValueTooLarge, rest: "8501010101"}, {input: "C60607080902", err: ErrValueTooLarge, rest: "C60607080902"}, |