From 3f2dcaebe3508d71492e2f629b66c1731711b6d6 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Mon, 2 Oct 2017 19:56:25 -0400 Subject: 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. --- objectivec/GPBUnknownField.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'objectivec/GPBUnknownField.m') 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] -- cgit v1.2.3