chore(deps): bump github.com/shamaton/msgpack/v2 from 2.2.0 to 2.2.2

Bumps [github.com/shamaton/msgpack/v2](https://github.com/shamaton/msgpack) from 2.2.0 to 2.2.2.
- [Release notes](https://github.com/shamaton/msgpack/releases)
- [Commits](https://github.com/shamaton/msgpack/compare/v2.2.0...v2.2.2)

---
updated-dependencies:
- dependency-name: github.com/shamaton/msgpack/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot]
2024-09-23 12:57:52 +02:00
committed by Ralf Haferkamp
parent 54c8567697
commit b3e5d80306
31 changed files with 180 additions and 197 deletions
+3 -3
View File
@@ -55,7 +55,7 @@ func (d *decoder) asComplex64(code byte, k reflect.Kind) (complex64, error) {
}
return complex(0, 0), fmt.Errorf("should not reach this line!! code %x decoding %v", code, k)
return complex(0, 0), d.errorTemplate(code, k)
}
func (d *decoder) asComplex128(code byte, k reflect.Kind) (complex128, error) {
@@ -94,7 +94,7 @@ func (d *decoder) asComplex128(code byte, k reflect.Kind) (complex128, error) {
return complex(0, 0), err
}
r := math.Float64frombits(binary.BigEndian.Uint64(rb))
ib, err := d.readSize8()
if err != nil {
return complex(0, 0), err
@@ -104,5 +104,5 @@ func (d *decoder) asComplex128(code byte, k reflect.Kind) (complex128, error) {
}
return complex(0, 0), fmt.Errorf("should not reach this line!! code %x decoding %v", code, k)
return complex(0, 0), d.errorTemplate(code, k)
}
@@ -5,6 +5,7 @@ import (
"io"
"reflect"
"github.com/shamaton/msgpack/v2/def"
"github.com/shamaton/msgpack/v2/internal/common"
)
@@ -18,13 +19,12 @@ type decoder struct {
// Decode analyzes the MessagePack-encoded data and stores
// the result into the pointer of v.
func Decode(r io.Reader, v interface{}, asArray bool) error {
if r == nil {
return fmt.Errorf("reader is nil")
return def.ErrNoData
}
rv := reflect.ValueOf(v)
if rv.Kind() != reflect.Ptr {
return fmt.Errorf("holder must set pointer value. but got: %t", v)
return fmt.Errorf("%w. v.(type): %T", def.ErrReceiverNotPointer, v)
}
rv = rv.Elem()
@@ -189,7 +189,7 @@ func (d *decoder) decodeWithCode(code byte, rv reflect.Value) error {
return err
}
if len(bs) > rv.Len() {
return fmt.Errorf("%v len is %d, but msgpack has %d elements", rv.Type(), rv.Len(), len(bs))
return fmt.Errorf("%v len is %d, but msgpack has %d elements, %w", rv.Type(), rv.Len(), len(bs), def.ErrNotMatchArrayElement)
}
for i, b := range bs {
rv.Index(i).SetUint(uint64(b))
@@ -203,7 +203,7 @@ func (d *decoder) decodeWithCode(code byte, rv reflect.Value) error {
return err
}
if l > rv.Len() {
return fmt.Errorf("%v len is %d, but msgpack has %d elements", rv.Type(), rv.Len(), l)
return fmt.Errorf("%v len is %d, but msgpack has %d elements, %w", rv.Type(), rv.Len(), l, def.ErrNotMatchArrayElement)
}
bs, err := d.asStringByteByLength(l, k)
if err != nil {
@@ -222,7 +222,7 @@ func (d *decoder) decodeWithCode(code byte, rv reflect.Value) error {
}
if l > rv.Len() {
return fmt.Errorf("%v len is %d, but msgpack has %d elements", rv.Type(), rv.Len(), l)
return fmt.Errorf("%v len is %d, but msgpack has %d elements, %w", rv.Type(), rv.Len(), l, def.ErrNotMatchArrayElement)
}
// create array dynamically
@@ -314,11 +314,11 @@ func (d *decoder) decodeWithCode(code byte, rv reflect.Value) error {
}
default:
return fmt.Errorf("type(%v) is unsupported", rv.Kind())
return fmt.Errorf("%v is %w type", rv.Kind(), def.ErrUnsupportedType)
}
return nil
}
func (d *decoder) errorTemplate(code byte, k reflect.Kind) error {
return fmt.Errorf("msgpack : invalid code %x decoding %v", code, k)
return fmt.Errorf("%w %x decoding as %v", def.ErrCanNotDecode, code, k)
}
+4 -4
View File
@@ -29,14 +29,14 @@ func (d *decoder) asFloat32WithCode(code byte, k reflect.Kind) (float32, error)
case d.isPositiveFixNum(code), code == def.Uint8, code == def.Uint16, code == def.Uint32, code == def.Uint64:
v, err := d.asUintWithCode(code, k)
if err != nil {
break
return 0, err
}
return float32(v), nil
case d.isNegativeFixNum(code), code == def.Int8, code == def.Int16, code == def.Int32, code == def.Int64:
v, err := d.asIntWithCode(code, k)
if err != nil {
break
return 0, err
}
return float32(v), nil
@@ -75,14 +75,14 @@ func (d *decoder) asFloat64WithCode(code byte, k reflect.Kind) (float64, error)
case d.isPositiveFixNum(code), code == def.Uint8, code == def.Uint16, code == def.Uint32, code == def.Uint64:
v, err := d.asUintWithCode(code, k)
if err != nil {
break
return 0, err
}
return float64(v), nil
case d.isNegativeFixNum(code), code == def.Int8, code == def.Int16, code == def.Int32, code == def.Int64:
v, err := d.asIntWithCode(code, k)
if err != nil {
break
return 0, err
}
return float64(v), nil
@@ -10,7 +10,7 @@ import (
func (d *decoder) asInterface(k reflect.Kind) (interface{}, error) {
code, err := d.readSize1()
if err != nil {
return 0, err
return nil, err
}
return d.asInterfaceWithCode(code, k)
}
@@ -133,7 +133,7 @@ func (d *decoder) asInterfaceWithCode(code byte, k reflect.Kind) (interface{}, e
return 0, err
}
if d.canSetAsMapKey(keyCode) != nil {
if err := d.canSetAsMapKey(keyCode); err != nil {
return nil, err
}
key, err := d.asInterfaceWithCode(keyCode, k)
@@ -169,9 +169,9 @@ func (d *decoder) asInterfaceWithCode(code byte, k reflect.Kind) (interface{}, e
func (d *decoder) canSetAsMapKey(code byte) error {
switch {
case d.isFixSlice(code), code == def.Array16, code == def.Array32:
return fmt.Errorf("can not use slice code for map key/ code: %x", code)
return fmt.Errorf("%w. code: %x", def.ErrCanNotSetSliceAsMapKey, code)
case d.isFixMap(code), code == def.Map16, code == def.Map32:
return fmt.Errorf("can not use map code for map key/ code: %x", code)
return fmt.Errorf("%w. code: %x", def.ErrCanNotSetMapAsMapKey, code)
}
return nil
}
+1 -1
View File
@@ -275,7 +275,7 @@ func (d *decoder) jumpOffset() error {
case code == def.Fixext16:
_, err = d.readSizeN(def.Byte1 + def.Byte16)
return err
case code == def.Ext8:
b, err := d.readSize1()
if err != nil {