From c3604d00f0d451297ff58b517fbbfba06b46e2f5 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Tue, 18 Aug 2020 12:14:47 +0300 Subject: [PATCH] Fix tests with nil check via reflection Signed-off-by: Alex Vanin --- util/proto/marshal.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/util/proto/marshal.go b/util/proto/marshal.go index 470d974..250db0f 100644 --- a/util/proto/marshal.go +++ b/util/proto/marshal.go @@ -9,6 +9,7 @@ package proto import ( "encoding/binary" "math/bits" + "reflect" ) type ( @@ -305,7 +306,7 @@ func NestedStructurePrefix(field int64) (prefix uint64, ln int) { } func NestedStructureMarshal(field int64, buf []byte, v stableMarshaller) (int, error) { - if v == nil { + if v == nil || reflect.ValueOf(v).IsNil() { return 0, nil } @@ -324,7 +325,7 @@ func NestedStructureMarshal(field int64, buf []byte, v stableMarshaller) (int, e } func NestedStructureSize(field int64, v stableMarshaller) (size int) { - if v == nil { + if v == nil || reflect.ValueOf(v).IsNil() { return 0 }