good morning!!!!

Skip to content
Snippets Groups Projects
Commit 357d00cd authored by Felix Lange's avatar Felix Lange
Browse files

common/hexutil: don't leak encoding/hex errors in Decode

All other functions return errors from package hexutil, ensure that
Decode does too.
parent f3b7dcc5
No related branches found
No related tags found
No related merge requests found
......@@ -60,7 +60,11 @@ func Decode(input string) ([]byte, error) {
if !has0xPrefix(input) {
return nil, ErrMissingPrefix
}
return hex.DecodeString(input[2:])
b, err := hex.DecodeString(input[2:])
if err != nil {
err = mapError(err)
}
return b, err
}
// MustDecode decodes a hex string with 0x prefix. It panics for invalid input.
......
......@@ -18,7 +18,6 @@ package hexutil
import (
"bytes"
"encoding/hex"
"math/big"
"testing"
)
......@@ -60,10 +59,10 @@ var (
// invalid
{input: ``, wantErr: ErrEmptyString},
{input: `0`, wantErr: ErrMissingPrefix},
{input: `0x0`, wantErr: hex.ErrLength},
{input: `0x023`, wantErr: hex.ErrLength},
{input: `0xxx`, wantErr: hex.InvalidByteError('x')},
{input: `0x01zz01`, wantErr: hex.InvalidByteError('z')},
{input: `0x0`, wantErr: ErrOddLength},
{input: `0x023`, wantErr: ErrOddLength},
{input: `0xxx`, wantErr: ErrSyntax},
{input: `0x01zz01`, wantErr: ErrSyntax},
// valid
{input: `0x`, want: []byte{}},
{input: `0X`, want: []byte{}},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment