소스 검색

Merge pull request #3839 from thomasvl/message_equality

When comparing message, require them to have the same descriptor.
Thomas Van Lenten 8 년 전
부모
커밋
239dba535c
1개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  1. 4 3
      objectivec/GPBMessage.m

+ 4 - 3
objectivec/GPBMessage.m

@@ -2591,13 +2591,14 @@ static void MergeRepeatedNotPackedFieldFromCodedInputStream(
   if (other == self) {
   if (other == self) {
     return YES;
     return YES;
   }
   }
-  if (![other isKindOfClass:[self class]] &&
-      ![self isKindOfClass:[other class]]) {
+  if (![other isKindOfClass:[GPBMessage class]]) {
     return NO;
     return NO;
   }
   }
-
   GPBMessage *otherMsg = other;
   GPBMessage *otherMsg = other;
   GPBDescriptor *descriptor = [[self class] descriptor];
   GPBDescriptor *descriptor = [[self class] descriptor];
+  if ([[otherMsg class] descriptor] != descriptor) {
+    return NO;
+  }
   uint8_t *selfStorage = (uint8_t *)messageStorage_;
   uint8_t *selfStorage = (uint8_t *)messageStorage_;
   uint8_t *otherStorage = (uint8_t *)otherMsg->messageStorage_;
   uint8_t *otherStorage = (uint8_t *)otherMsg->messageStorage_;