aboutsummaryrefslogtreecommitdiff
path: root/objectivec/GPBArray.m
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2017-01-04 15:03:42 -0500
committerBo Yang <paulyang1211@gmail.com>2017-01-09 11:43:17 -0800
commit64cbfab937d3b9a176dfdf7d32c2ac8b29e30fca (patch)
tree446f4f94ccbaeaf3a5db331372c2f855c821c778 /objectivec/GPBArray.m
parent77e434de36cf549bfba97782bfa6a58206b89e75 (diff)
downloadprotobuf-64cbfab937d3b9a176dfdf7d32c2ac8b29e30fca.tar.gz
protobuf-64cbfab937d3b9a176dfdf7d32c2ac8b29e30fca.tar.bz2
protobuf-64cbfab937d3b9a176dfdf7d32c2ac8b29e30fca.zip
Minor fix for autocreated object repeated fields and maps.
- If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list.
Diffstat (limited to 'objectivec/GPBArray.m')
-rw-r--r--objectivec/GPBArray.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/objectivec/GPBArray.m b/objectivec/GPBArray.m
index ae57747d..f401631d 100644
--- a/objectivec/GPBArray.m
+++ b/objectivec/GPBArray.m
@@ -2519,14 +2519,14 @@ static BOOL ArrayDefault_IsValidValue(int32_t value) {
- (id)copyWithZone:(NSZone *)zone {
if (_array == nil) {
- _array = [[NSMutableArray alloc] init];
+ return [[NSMutableArray allocWithZone:zone] init];
}
return [_array copyWithZone:zone];
}
- (id)mutableCopyWithZone:(NSZone *)zone {
if (_array == nil) {
- _array = [[NSMutableArray alloc] init];
+ return [[NSMutableArray allocWithZone:zone] init];
}
return [_array mutableCopyWithZone:zone];
}