| commit | c415efe91a3a2c82d6647f1e133c6e4a53cf0dfc | [log] [tgz] |
|---|---|---|
| author | David K. Bainbridge <dbainbri@ciena.com> | Thu Aug 19 13:05:21 2021 +0000 |
| committer | David K. Bainbridge <dbainbri@ciena.com> | Tue Oct 05 17:16:08 2021 +0000 |
| tree | e013cdead3b3c884ae31c1fba8bd4d65e2a1e398 | |
| parent | 150f1bb26d9b8ee6a3f89cfbf77de50c564be499 [diff] [blame] |
gRPC migration Change-Id: Ib390f6dde0d5a8d6db12ccd7da41135570ad1354
diff --git a/vendor/google.golang.org/protobuf/internal/impl/merge.go b/vendor/google.golang.org/protobuf/internal/impl/merge.go index cdc4267..c65bbc0 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 @@ } } 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...) } }