diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-06-05 10:15:05 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-06-05 10:15:05 +0200 |
| commit | b401bd1ccbce7fa547c75e9f0ae89e211112c1bb (patch) | |
| tree | 08bf9ed438713e8c390ea60732e7dfc14b0d3191 /vendor/github.com/golang/protobuf | |
| parent | [chore]: Bump github.com/minio/minio-go/v7 from 7.0.55 to 7.0.56 (#1869) (diff) | |
| download | gotosocial-b401bd1ccbce7fa547c75e9f0ae89e211112c1bb.tar.xz | |
[chore] update latest deps, ensure readme up to date (#1873)
* [chore] update latest deps, ensure readme up to date
* remove double entry
Diffstat (limited to 'vendor/github.com/golang/protobuf')
| -rw-r--r-- | vendor/github.com/golang/protobuf/jsonpb/decode.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vendor/github.com/golang/protobuf/jsonpb/decode.go b/vendor/github.com/golang/protobuf/jsonpb/decode.go index 60e82caa9..6c16c255f 100644 --- a/vendor/github.com/golang/protobuf/jsonpb/decode.go +++ b/vendor/github.com/golang/protobuf/jsonpb/decode.go @@ -386,8 +386,14 @@ func (u *Unmarshaler) unmarshalMessage(m protoreflect.Message, in []byte) error } func isSingularWellKnownValue(fd protoreflect.FieldDescriptor) bool { + if fd.Cardinality() == protoreflect.Repeated { + return false + } if md := fd.Message(); md != nil { - return md.FullName() == "google.protobuf.Value" && fd.Cardinality() != protoreflect.Repeated + return md.FullName() == "google.protobuf.Value" + } + if ed := fd.Enum(); ed != nil { + return ed.FullName() == "google.protobuf.NullValue" } return false } |