add error on nil reference values counter

scylladb · Oct 10, 2024 · 5d31f69 · 5d31f69
1 parent 2bb2f93
commit 5d31f69
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 19 deletions.
diff --git a/marshal/counter/marshal_utils.go b/marshal/counter/marshal_utils.go
@@ -181,11 +181,11 @@ func EncReflect(v reflect.Value) ([]byte, error) {
 		}
 		n, err := strconv.ParseInt(val, 10, 64)
 		if err != nil {
-			return nil, fmt.Errorf("failed to marshal counter: can not marshal %#v %s", v.Interface(), err)
+			return nil, fmt.Errorf("failed to marshal counter: can not marshal (%T)(%[1]v) %s", v.Interface(), err)
 		}
 		return encInt64(n), nil
 	default:
-		return nil, fmt.Errorf("failed to marshal counter: unsupported value type (%T)(%#[1]v)", v.Interface())
+		return nil, fmt.Errorf("failed to marshal counter: unsupported value type (%T)(%[1]v)", v.Interface())
 	}
 }
 

diff --git a/marshal/counter/unmarshal.go b/marshal/counter/unmarshal.go
@@ -71,7 +71,7 @@ func Unmarshal(data []byte, value interface{}) error {
 		rv := reflect.ValueOf(value)
 		rt := rv.Type()
 		if rt.Kind() != reflect.Ptr {
-			return fmt.Errorf("failed to unmarshal counter: unsupported value type (%T)(%#[1]v)", value)
+			return fmt.Errorf("failed to unmarshal counter: unsupported value type (%T)(%[1]v)", value)
 		}
 		if rt.Elem().Kind() != reflect.Ptr {
 			return DecReflect(data, rv)