Fix to C# support library code

(This was the only use of a HasXyz property for a message type.)
protocolbuffers · May 1, 2020 · ed5c874 · ed5c874
1 parent 9926c95
commit ed5c874
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
@@ -394,7 +394,7 @@ internal void CrossLink()
 
             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.");
             }