ソースを参照

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.
Thomas Van Lenten 8 年 前
コミット
1f57e540ac
1 ファイル変更4 行追加3 行削除
  1. 4 3
      objectivec/GPBMessage.m

+ 4 - 3
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_;