diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2024-07-11 10:16:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-11 10:16:54 +0800 |
| commit | 530bedfb151c4d1ac226c14a332fde59c7f2266c (patch) | |
| tree | 3ec616656344be9013c26929e03347bb12c35c82 /vendor/google.golang.org/protobuf/encoding/prototext/decode.go | |
| parent | Merge pull request #5545 from luomengY/automated-cherry-pick-of-#5467-upstrea... (diff) | |
| parent | update k8s version to v1.27.15 in CI (diff) | |
| download | kubeedge-530bedfb151c4d1ac226c14a332fde59c7f2266c.tar.gz | |
Merge pull request #5699 from Shelley-BaoYue/bump-k8s-v1.27.15
Bump k8s from v1.27.7 to v1.27.15
Diffstat (limited to 'vendor/google.golang.org/protobuf/encoding/prototext/decode.go')
| -rw-r--r-- | vendor/google.golang.org/protobuf/encoding/prototext/decode.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vendor/google.golang.org/protobuf/encoding/prototext/decode.go b/vendor/google.golang.org/protobuf/encoding/prototext/decode.go index 4921b2d4a..a45f112bc 100644 --- a/vendor/google.golang.org/protobuf/encoding/prototext/decode.go +++ b/vendor/google.golang.org/protobuf/encoding/prototext/decode.go @@ -21,7 +21,7 @@ import ( "google.golang.org/protobuf/reflect/protoregistry" ) -// Unmarshal reads the given []byte into the given proto.Message. +// Unmarshal reads the given []byte into the given [proto.Message]. // The provided message must be mutable (e.g., a non-nil pointer to a message). func Unmarshal(b []byte, m proto.Message) error { return UnmarshalOptions{}.Unmarshal(b, m) @@ -51,7 +51,7 @@ type UnmarshalOptions struct { } } -// Unmarshal reads the given []byte and populates the given proto.Message +// Unmarshal reads the given []byte and populates the given [proto.Message] // using options in the UnmarshalOptions object. // The provided message must be mutable (e.g., a non-nil pointer to a message). func (o UnmarshalOptions) Unmarshal(b []byte, m proto.Message) error { @@ -739,7 +739,9 @@ func (d decoder) skipValue() error { case text.ListClose: return nil case text.MessageOpen: - return d.skipMessageValue() + if err := d.skipMessageValue(); err != nil { + return err + } default: // Skip items. This will not validate whether skipped values are // of the same type or not, same behavior as C++ |
