[ObjC] Add DEBUG-only validations to extension values in GPBMessage, along with tests.

PiperOrigin-RevId: 902869088

Author: protobuf-github-bot

objectivec/GPBMessage.m

@@ -306,6 +306,57 @@ static void CheckExtension(GPBMessage *self, GPBExtensionDescriptor *extension)
   }
 }
 
+#if defined(DEBUG) && DEBUG
+static void CheckExtensionValue(GPBExtensionDescriptor *extension, id value) {
+  // If asserts are stripped, value is unused.
+  (void)value;
+  switch (extension.dataType) {
+    case GPBDataTypeBool:
+    case GPBDataTypeFixed32:
+    case GPBDataTypeSFixed32:
+    case GPBDataTypeFloat:
+    case GPBDataTypeFixed64:
+    case GPBDataTypeSFixed64:
+    case GPBDataTypeDouble:
+    case GPBDataTypeInt32:
+    case GPBDataTypeInt64:
+    case GPBDataTypeSInt32:
+    case GPBDataTypeSInt64:
+    case GPBDataTypeUInt32:
+    case GPBDataTypeUInt64:
+      NSCAssert([value isKindOfClass:[NSNumber class]],
+                @"Extension %@ value must be an NSNumber (was %@)", extension.singletonName,
+                [value class]);
+      break;
+    case GPBDataTypeEnum:
+      NSCAssert([value isKindOfClass:[NSNumber class]],
+                @"Extension %@ value must be an NSNumber (was %@)", extension.singletonName,
+                [value class]);
+      NSCAssert(!extension.enumDescriptor.isClosed ||
+                    extension.enumDescriptor.enumVerifier([value intValue]),
+                @"Extension %@ has value %d which is not a valid %@", extension.singletonName,
+                [value intValue], extension.enumDescriptor.name);
+      break;
+    case GPBDataTypeBytes:
+      NSCAssert([value isKindOfClass:[NSData class]],
+                @"Extension %@ value must be of type NSData (was %@)", extension.singletonName,
+                [value class]);
+      break;
+    case GPBDataTypeString:
+      NSCAssert([value isKindOfClass:[NSString class]],
+                @"Extension %@ value must be of type NSString (was %@)", extension.singletonName,
+                [value class]);
+      break;
+    case GPBDataTypeMessage:
+    case GPBDataTypeGroup:
+      NSCAssert([value isKindOfClass:extension.msgClass],
+                @"Extension %@ value must be of type %@ (was %@)", extension.singletonName,
+                extension.msgClass, [value class]);
+      break;
+  }
+}
+#endif
+
 static NSMutableDictionary *CloneExtensionMap(NSDictionary *extensionMap, NSZone *zone) {
   if (extensionMap.count == 0) {
     return nil;
@@ -2151,6 +2202,9 @@ - (void)setExtension:(GPBExtensionDescriptor *)extension value:(id)value {
   }
 
   CheckExtension(self, extension);
+#if defined(DEBUG) && DEBUG
+  CheckExtensionValue(extension, value);
+#endif
 
   if (extension.repeated) {
     [NSException raise:NSInvalidArgumentException
@@ -2184,6 +2238,9 @@ - (void)setExtension:(GPBExtensionDescriptor *)extension value:(id)value {
 
 - (void)addExtension:(GPBExtensionDescriptor *)extension value:(id)value {
   CheckExtension(self, extension);
+#if defined(DEBUG) && DEBUG
+  CheckExtensionValue(extension, value);
+#endif
 
   if (!extension.repeated) {
     [NSException raise:NSInvalidArgumentException
@@ -2205,6 +2262,9 @@ - (void)addExtension:(GPBExtensionDescriptor *)extension value:(id)value {
 
 - (void)setExtension:(GPBExtensionDescriptor *)extension index:(NSUInteger)idx value:(id)value {
   CheckExtension(self, extension);
+#if defined(DEBUG) && DEBUG
+  CheckExtensionValue(extension, value);
+#endif
 
   if (!extension.repeated) {
     [NSException raise:NSInvalidArgumentException

objectivec/Tests/GPBMessageTests.m

@@ -2754,4 +2754,94 @@ - (void)testWriteToFullOutputStreamShouldThrow {
                                GPBCodedOutputStreamException_WriteFailed);
 }
 
+- (void)testExtensionValueValidation {
+#if defined(DEBUG) && DEBUG
+  TestAllExtensions *message = [TestAllExtensions message];
+
+#if defined(GPB_UNITTEST_USE_C_FUNCTION_FOR_EXTENSIONS)
+  GPBExtensionDescriptor *msgExt = Objc_Protobuf_Tests_extension_OptionalNestedMessageExtension();
+  GPBExtensionDescriptor *enumExt = Objc_Protobuf_Tests_extension_OptionalNestedEnumExtension();
+  GPBExtensionDescriptor *repeatedEnumExt =
+      Objc_Protobuf_Tests_extension_RepeatedNestedEnumExtension();
+#else
+  GPBExtensionDescriptor *msgExt = [UnittestRoot optionalNestedMessageExtension];
+  GPBExtensionDescriptor *enumExt = [UnittestRoot optionalNestedEnumExtension];
+  GPBExtensionDescriptor *repeatedEnumExt = [UnittestRoot repeatedNestedEnumExtension];
+#endif
+
+#if defined(GPB_UNITTEST_USE_C_FUNCTION_FOR_EXTENSIONS)
+  GPBExtensionDescriptor *int32Ext = Objc_Protobuf_Tests_extension_OptionalInt32Extension();
+  GPBExtensionDescriptor *stringExt = Objc_Protobuf_Tests_extension_OptionalStringExtension();
+  GPBExtensionDescriptor *bytesExt = Objc_Protobuf_Tests_extension_OptionalBytesExtension();
+#else
+  GPBExtensionDescriptor *int32Ext = [UnittestRoot optionalInt32Extension];
+  GPBExtensionDescriptor *stringExt = [UnittestRoot optionalStringExtension];
+  GPBExtensionDescriptor *bytesExt = [UnittestRoot optionalBytesExtension];
+#endif
+
+  // Message extension with wrong type
+  XCTAssertThrowsSpecificNamed(
+      ^{
+        [message setExtension:msgExt value:@5];
+      }(),
+      NSException, NSInternalInconsistencyException);
+
+  // Enum extension with wrong type
+  XCTAssertThrowsSpecificNamed(
+      ^{
+        [message setExtension:enumExt value:@"Not a number"];
+      }(),
+      NSException, NSInternalInconsistencyException);
+
+  // Enum extension with invalid enum value (999 is not a valid enum value for the closed
+  // TestAllTypes_NestedEnum)
+  XCTAssertThrowsSpecificNamed(
+      ^{
+        [message setExtension:enumExt value:@999];
+      }(),
+      NSException, NSInternalInconsistencyException);
+
+  // Repeated enum extension with invalid value
+  XCTAssertThrowsSpecificNamed(
+      ^{
+        [message addExtension:repeatedEnumExt value:@999];
+      }(),
+      NSException, NSInternalInconsistencyException);
+
+  // Setting invalid value by index in repeated enum extension
+  [message addExtension:repeatedEnumExt value:@(TestAllTypes_NestedEnum_Foo)];
+  XCTAssertThrowsSpecificNamed(
+      ^{
+        [message setExtension:repeatedEnumExt index:0 value:@999];
+      }(),
+      NSException, NSInternalInconsistencyException);
+
+  // Primitive extension with wrong type
+  XCTAssertThrowsSpecificNamed(
+      ^{
+        [message setExtension:int32Ext value:@"Not a number"];
+      }(),
+      NSException, NSInternalInconsistencyException);
+
+  XCTAssertThrowsSpecificNamed(
+      ^{
+        [message setExtension:stringExt value:@5];
+      }(),
+      NSException, NSInternalInconsistencyException);
+
+  XCTAssertThrowsSpecificNamed(
+      ^{
+        [message setExtension:bytesExt value:@"Not NSData"];
+      }(),
+      NSException, NSInternalInconsistencyException);
+
+  // Valid values should not throw
+  XCTAssertNoThrow([message setExtension:msgExt value:[TestAllTypes_NestedMessage message]]);
+  XCTAssertNoThrow([message setExtension:enumExt value:@(TestAllTypes_NestedEnum_Foo)]);
+  XCTAssertNoThrow([message setExtension:int32Ext value:@5]);
+  XCTAssertNoThrow([message setExtension:stringExt value:@"foo"]);
+  XCTAssertNoThrow([message setExtension:bytesExt value:[NSData data]]);
+#endif
+}
+
 @end