diff options
| author | Janos Guljas <janos@resenje.org> | 2017-12-13 17:23:11 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2017-12-13 17:40:39 +0800 |
| commit | 19982f946735948478b6b7e7706f1b615f171d0d (patch) | |
| tree | cbacbdb6f9e6e731c2ebc17bad74e875f4d8ea8b /rlp | |
| parent | 1dc19de5da64962a98a37bbc7b93a3895d2eb6e6 (diff) | |
| parent | 32516c768ec09e2a71cab5983d2c8b8ae5d92fc7 (diff) | |
| download | dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.gz dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.bz2 dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.lz dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.xz dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.zst dexon-19982f946735948478b6b7e7706f1b615f171d0d.zip | |
swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Merge with changes that implement config file PR #15548.
Field *EnsApi string* in swarm/api.Config is replaced with
*EnsAPIs []string*.
A new field *EnsDisabled bool* is added to swarm/api.Config for
easy way to disable ENS resolving with config file.
Signature of function swarm.NewSwarm is changed and simplified.
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"}, |