Raise errors when serialize inf and nan for Value.number_value in json format. fixes #11259

PiperOrigin-RevId: 495976996

Author: anandolee

python/google/protobuf/internal/json_format_test.py

@@ -608,6 +608,23 @@ def testValueMessage(self):
     json_format.Parse('{"value": null}', message)
     self.assertEqual(message.value.WhichOneof('kind'), 'null_value')
 
+  def testValueMessageErrors(self):
+    message = json_format_proto3_pb2.TestValue()
+    message.value.number_value = math.inf
+    with self.assertRaises(json_format.SerializeToJsonError) as cm:
+      json_format.MessageToJson(message)
+    self.assertEqual(
+        'Failed to serialize value field: Fail to serialize Infinity for '
+        'Value.number_value, which would parse as string_value.',
+        str(cm.exception))
+    message.value.number_value = math.nan
+    with self.assertRaises(json_format.SerializeToJsonError) as cm:
+      json_format.MessageToJson(message)
+    self.assertEqual(
+        'Failed to serialize value field: Fail to serialize NaN for '
+        'Value.number_value, which would parse as string_value.',
+        str(cm.exception))
+
   def testListValueMessage(self):
     message = json_format_proto3_pb2.TestListValue()
     message.value.values.add().number_value = 11.1

python/google/protobuf/json_format.py

@@ -354,8 +354,14 @@ def _ValueMessageToJsonObject(self, message):
       return None
     if which == 'list_value':
       return self._ListValueMessageToJsonObject(message.list_value)
-    if which == 'struct_value':
-      value = message.struct_value
+    if which == 'number_value':
+      value = message.number_value
+      if math.isinf(value):
+        raise ValueError('Fail to serialize Infinity for Value.number_value, '
+                         'which would parse as string_value')
+      if math.isnan(value):
+        raise ValueError('Fail to serialize NaN for Value.number_value, '
+                         'which would parse as string_value')
     else:
       value = getattr(message, which)
     oneof_descriptor = message.DESCRIPTOR.fields_by_name[which]