diff options
| author | Wim <wim@42.be> | 2021-10-17 00:47:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-17 00:47:22 +0200 |
| commit | 4dd8bae5c91fa4aef09d865d8fef1acd84f90925 (patch) | |
| tree | ffad9b242daccaf8c86d1c1fbd59032302bd3be9 /vendor/google.golang.org/protobuf/internal/impl | |
| parent | 7ae45c42e712bd0e66c101f3f714c05aa1dc2104 (diff) | |
| download | matterbridge-msglm-4dd8bae5c91fa4aef09d865d8fef1acd84f90925.tar.gz matterbridge-msglm-4dd8bae5c91fa4aef09d865d8fef1acd84f90925.tar.bz2 matterbridge-msglm-4dd8bae5c91fa4aef09d865d8fef1acd84f90925.zip | |
Update dependencies (#1610)
* Update dependencies
* Update module to go 1.17
Diffstat (limited to 'vendor/google.golang.org/protobuf/internal/impl')
| -rw-r--r-- | vendor/google.golang.org/protobuf/internal/impl/legacy_message.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vendor/google.golang.org/protobuf/internal/impl/legacy_message.go b/vendor/google.golang.org/protobuf/internal/impl/legacy_message.go index 3759b010..029feeef 100644 --- a/vendor/google.golang.org/protobuf/internal/impl/legacy_message.go +++ b/vendor/google.golang.org/protobuf/internal/impl/legacy_message.go @@ -440,6 +440,13 @@ func legacyMerge(in piface.MergeInput) piface.MergeOutput { if !ok { return piface.MergeOutput{} } + if !in.Source.IsValid() { + // Legacy Marshal methods may not function on nil messages. + // Check for a typed nil source only after we confirm that + // legacy Marshal/Unmarshal methods are present, for + // consistency. + return piface.MergeOutput{Flags: piface.MergeComplete} + } b, err := marshaler.Marshal() if err != nil { return piface.MergeOutput{} |