diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2017-10-02 19:56:25 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2017-10-02 19:56:25 -0400 |
commit | 3f2dcaebe3508d71492e2f629b66c1731711b6d6 (patch) | |
tree | b76bc8422709b796bc462c53719a1ad3cc1e2a2d /objectivec/GPBUnknownField.m | |
parent | 210be267fd81d5aafdc049d197d57cb45b75f3ba (diff) | |
download | protobuf-3f2dcaebe3508d71492e2f629b66c1731711b6d6.tar.gz protobuf-3f2dcaebe3508d71492e2f629b66c1731711b6d6.tar.bz2 protobuf-3f2dcaebe3508d71492e2f629b66c1731711b6d6.zip |
ObjC: Fix merging of length delimited unknown fields.
- Add a test to cover this and tweak the test to not use two merge
paths to be sure things are as expected.
Diffstat (limited to 'objectivec/GPBUnknownField.m')
-rw-r--r-- | objectivec/GPBUnknownField.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/objectivec/GPBUnknownField.m b/objectivec/GPBUnknownField.m index 30efe756..15e0a6dc 100644 --- a/objectivec/GPBUnknownField.m +++ b/objectivec/GPBUnknownField.m @@ -79,7 +79,7 @@ result->mutableFixed32List_ = [mutableFixed32List_ copyWithZone:zone]; result->mutableFixed64List_ = [mutableFixed64List_ copyWithZone:zone]; result->mutableLengthDelimitedList_ = - [mutableLengthDelimitedList_ copyWithZone:zone]; + [mutableLengthDelimitedList_ mutableCopyWithZone:zone]; result->mutableVarintList_ = [mutableVarintList_ copyWithZone:zone]; if (mutableGroupList_.count) { result->mutableGroupList_ = [[NSMutableArray allocWithZone:zone] |