diff options
| author | Wim <wim@42.be> | 2021-06-16 21:00:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-16 21:00:49 +0200 |
| commit | fb5a84212c491332504fcdd4b5f4a4b97705d2e3 (patch) | |
| tree | be03e973d30d040a49a90c47f1e6b73ed8922539 /vendor/google.golang.org/protobuf/internal/impl/merge.go | |
| parent | dedc1c45a113d8db373d9e4638f54a0f9d29624f (diff) | |
| download | matterbridge-msglm-fb5a84212c491332504fcdd4b5f4a4b97705d2e3.tar.gz matterbridge-msglm-fb5a84212c491332504fcdd4b5f4a4b97705d2e3.tar.bz2 matterbridge-msglm-fb5a84212c491332504fcdd4b5f4a4b97705d2e3.zip | |
Update dependencies (#1521)
Diffstat (limited to 'vendor/google.golang.org/protobuf/internal/impl/merge.go')
| -rw-r--r-- | vendor/google.golang.org/protobuf/internal/impl/merge.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor/google.golang.org/protobuf/internal/impl/merge.go b/vendor/google.golang.org/protobuf/internal/impl/merge.go index cdc4267d..c65bbc04 100644 --- a/vendor/google.golang.org/protobuf/internal/impl/merge.go +++ b/vendor/google.golang.org/protobuf/internal/impl/merge.go @@ -77,9 +77,9 @@ func (mi *MessageInfo) mergePointer(dst, src pointer, opts mergeOptions) { } } if mi.unknownOffset.IsValid() { - du := dst.Apply(mi.unknownOffset).Bytes() - su := src.Apply(mi.unknownOffset).Bytes() - if len(*su) > 0 { + su := mi.getUnknownBytes(src) + if su != nil && len(*su) > 0 { + du := mi.mutableUnknownBytes(dst) *du = append(*du, *su...) } } |