From 1f57e540accbb36f350da3e8f341e67ab0188de9 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Fri, 3 Nov 2017 12:49:28 -0400 Subject: [PATCH] When comparing message, require them to have the same descriptor. This will cover someone subclassing the message, and also handles something crazy like someone comparing to a raw NSObject. --- objectivec/GPBMessage.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/objectivec/GPBMessage.m b/objectivec/GPBMessage.m index 37cff6ceff..afe39c1eb0 100644 --- a/objectivec/GPBMessage.m +++ b/objectivec/GPBMessage.m @@ -2591,13 +2591,14 @@ static void MergeRepeatedNotPackedFieldFromCodedInputStream( if (other == self) { return YES; } - if (![other isKindOfClass:[self class]] && - ![self isKindOfClass:[other class]]) { + if (![other isKindOfClass:[GPBMessage class]]) { return NO; } - GPBMessage *otherMsg = other; GPBDescriptor *descriptor = [[self class] descriptor]; + if ([[otherMsg class] descriptor] != descriptor) { + return NO; + } uint8_t *selfStorage = (uint8_t *)messageStorage_; uint8_t *otherStorage = (uint8_t *)otherMsg->messageStorage_;