Skip to content

fix: avoid panic on reflected param parsing code #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2022
Merged

fix: avoid panic on reflected param parsing code #888

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion lens/util/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,9 @@ func ParseParams(params []byte, method abi.MethodNum, actCode cid.Cid) (string,
b, err := MarshalWithOverrides(p, map[reflect.Type]marshaller{
reflect.TypeOf(bitfield.BitField{}): bitfieldCountMarshaller,
})
if err != nil {
return "", "", xerrors.Errorf("failed to parse message params method: %d, actor code: %s, params: %s: %w", method, actCode, string(params), err)
}

return string(b), m.Name, err
}
Expand Down Expand Up @@ -351,7 +354,13 @@ func MakeGetActorCodeFunc(ctx context.Context, store adt.Store, next, current *t

type marshaller func(interface{}) ([]byte, error)

func MarshalWithOverrides(v interface{}, overrides map[reflect.Type]marshaller) ([]byte, error) {
func MarshalWithOverrides(v interface{}, overrides map[reflect.Type]marshaller) (out []byte, err error) {
defer func() {
if r := recover(); r != nil {
out = nil
err = xerrors.Errorf("failed to override message param json marshaller: %v", r)
}
}()
pwt := paramWrapperType{
obj: v,
replace: overrides,
Expand Down Expand Up @@ -388,6 +397,10 @@ func (wt *paramWrapperType) MarshalJSON() ([]byte, error) {

switch t.Kind() {
case reflect.Struct:
// if an empty struct marshal the empty struct and bail.
if v.IsZero() {
return json.Marshal(wt.obj)
}
// if its a struct, walk its fields and recurse.
m := make(map[string]interface{})
for i := 0; i < v.NumField(); i++ {
Expand Down