diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2021-09-10 14:42:14 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-09-10 14:42:14 +0200 |
| commit | f2e5bedea6fb93fbbf68ed8f7153c353cc57a9f0 (patch) | |
| tree | 475ae9e7470d0df670ab2a59dce351cd1d07498a /vendor/google.golang.org/protobuf/internal/impl | |
| parent | fixes + db changes (#204) (diff) | |
| download | gotosocial-f2e5bedea6fb93fbbf68ed8f7153c353cc57a9f0.tar.xz | |
migrate go version to 1.17 (#203)
* migrate go version to 1.17
* update contributing
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 3759b010c..029feeefd 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{} |