Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,22 @@ func NewCBOREncoder(w io.Writer) Encoder {
return cbor.NewEncoder(w)
}

// Single ceiling for CBOR arrays and maps (fxamacker/cbor defaults are 131072 each).
const cborMaxDecodeElements = 500_000

type errDecoder struct{ err error }

func (d errDecoder) Decode(v any) error { return d.err }

func NewCBORDecoder(r io.Reader) Decoder {
opt := cbor.DecOptions{
MaxNestedLevels: 1024, // Set the desired maximum nesting depth
MaxNestedLevels: 1024,
MaxArrayElements: cborMaxDecodeElements,
MaxMapPairs: cborMaxDecodeElements,
}
mode, err := opt.DecMode()
if err != nil {
return errDecoder{err}
}
mode, _ := opt.DecMode()
return mode.NewDecoder(r)
}
44 changes: 44 additions & 0 deletions encoding_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package ethwal

import (
"bytes"
"testing"

"github.com/fxamacker/cbor/v2"
"github.com/stretchr/testify/require"
)

func TestNewCBORDecoderLargeArray(t *testing.T) {
const n = 131073
s := make([]uint64, n)
for i := range s {
s[i] = uint64(i)
}
data, err := cbor.Marshal(s)
require.NoError(t, err)

var out []uint64
dec := NewCBORDecoder(bytes.NewReader(data))
err = dec.Decode(&out)
require.NoError(t, err)
require.Len(t, out, n)
}

func TestNewCBORDecoderLargeMap(t *testing.T) {
const n = 131073
m := make(map[uint64]uint64, n)
for i := uint64(0); i < n; i++ {
m[i] = i
}
data, err := cbor.Marshal(m)
require.NoError(t, err)

var out map[uint64]uint64
dec := NewCBORDecoder(bytes.NewReader(data))
err = dec.Decode(&out)
require.NoError(t, err)
require.Len(t, out, n)
require.Equal(t, uint64(0), out[0])
require.Equal(t, uint64(n-1), out[n-1])
require.Equal(t, uint64(n/2), out[n/2])
}
Loading