Fix to C# support library code

(This was the only use of a HasXyz property for a message type.)
5 years ago · ed5c874de3
parent 9926c9504b
commit ed5c874de3
1 changed files with 1 additions and 1 deletions
--- a/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
+++ b/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
@ -394,7 +394,7 @@ namespace Google.Protobuf.Reflection

            File.DescriptorPool.AddFieldByNumber(this);

-            if (ContainingType != null && ContainingType.Proto.HasOptions && ContainingType.Proto.Options.MessageSetWireFormat)
+            if (ContainingType != null && ContainingType.Proto.Options != null && ContainingType.Proto.Options.MessageSetWireFormat)
            {
                throw new DescriptorValidationException(this, "MessageSet format is not supported.");
            }