AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Tighten up class usage/checks.

Browse Source 
- 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.
This commit is contained in:
Thomas Van Lenten 2017-04-18 13:10:52 -04:00
parent 8aa927f08f
commit f5a01d1bbd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
objectivec/GPBMessage.m
View File

@ -130,7 +130,7 @@ static NSError *ErrorFromException(NSException *exception) {
static void CheckExtension(GPBMessage *self, static void CheckExtension(GPBMessage *self,
GPBExtensionDescriptor *extension) { GPBExtensionDescriptor *extension) {
if ([self class] != extension.containingMessageClass) { if (![self isKindOfClass:extension.containingMessageClass]) {
[NSException [NSException
raise:NSInvalidArgumentException raise:NSInvalidArgumentException
format:@"Extension %@ used on wrong class (%@ instead of %@)", format:@"Extension %@ used on wrong class (%@ instead of %@)",
@ -3189,7 +3189,7 @@ static void ResolveIvarSet(GPBFieldDescriptor *field,
+ (BOOL)resolveClassMethod:(SEL)sel { + (BOOL)resolveClassMethod:(SEL)sel {
// Extensions scoped to a Message and looked up via class methods. // Extensions scoped to a Message and looked up via class methods.
if (GPBResolveExtensionClassMethod(self, sel)) { if (GPBResolveExtensionClassMethod([self descriptor].messageClass, sel)) {
return YES; return YES;
} }
return [super resolveClassMethod:sel]; return [super resolveClassMethod:sel];