roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

rlp: fix string size check in readKind (#15625)

Browse Source 
Issue found by @guidovranken
This commit is contained in:
Felix Lange 2017-12-11 22:47:10 +01:00 committed by GitHub
parent e7610eadfe
commit 2499b1b139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rlp/raw.go
View File

@ -98,7 +98,7 @@ func readKind(buf []byte) (k Kind, tagsize, contentsize uint64, err error) {
tagsize = 1 tagsize = 1
contentsize = uint64(b - 0x80) contentsize = uint64(b - 0x80)
// Reject strings that should've been single bytes. // 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 return 0, 0, 0, ErrCanonSize
} }
case b < 0xC0: case b < 0xC0:

1
rlp/raw_test.go
View File

@ -96,6 +96,7 @@ func TestSplit(t *testing.T) {
{input: "F90055", err: ErrCanonSize, rest: "F90055"}, {input: "F90055", err: ErrCanonSize, rest: "F90055"},
{input: "FA0002FFFF", err: ErrCanonSize, rest: "FA0002FFFF"}, {input: "FA0002FFFF", err: ErrCanonSize, rest: "FA0002FFFF"},
{input: "81", err: ErrValueTooLarge, rest: "81"},
{input: "8501010101", err: ErrValueTooLarge, rest: "8501010101"}, {input: "8501010101", err: ErrValueTooLarge, rest: "8501010101"},
{input: "C60607080902", err: ErrValueTooLarge, rest: "C60607080902"}, {input: "C60607080902", err: ErrValueTooLarge, rest: "C60607080902"},