From f5a01d1bbdb003e02fb32e1d4f5dffffdcae6bdf Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Tue, 18 Apr 2017 13:10:52 -0400 Subject: Tighten up class usage/checks. - Ensure extensions resolution/wiring is happening directly on the messageClass (incase someone is doing odd things our out classes). - Make the extension message check match the other class checks in for mergeFrom/isEqual/etc. --- objectivec/GPBMessage.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'objectivec/GPBMessage.m') diff --git a/objectivec/GPBMessage.m b/objectivec/GPBMessage.m index 78935b19..627a396e 100644 --- a/objectivec/GPBMessage.m +++ b/objectivec/GPBMessage.m @@ -130,7 +130,7 @@ static NSError *ErrorFromException(NSException *exception) { static void CheckExtension(GPBMessage *self, GPBExtensionDescriptor *extension) { - if ([self class] != extension.containingMessageClass) { + if (![self isKindOfClass:extension.containingMessageClass]) { [NSException raise:NSInvalidArgumentException format:@"Extension %@ used on wrong class (%@ instead of %@)", @@ -3189,7 +3189,7 @@ static void ResolveIvarSet(GPBFieldDescriptor *field, + (BOOL)resolveClassMethod:(SEL)sel { // Extensions scoped to a Message and looked up via class methods. - if (GPBResolveExtensionClassMethod(self, sel)) { + if (GPBResolveExtensionClassMethod([self descriptor].messageClass, sel)) { return YES; } return [super resolveClassMethod:sel]; -- cgit v1.2.3