Merge pull request #9430 from xoofx/fix-csharp-fielddesc-ispacked

Fixes NullReferenceException when accessing FieldDescriptor.IsPacked
3 years ago · c756e61878
parent 15add1af49 16941420c9
commit c756e61878
1 changed files with 2 additions and 1 deletions
--- a/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
+++ b/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
@ -247,7 +247,8 @@ namespace Google.Protobuf.Reflection
                }
                else
                {
-                    return !Proto.Options.HasPacked || Proto.Options.Packed;
+                    // Packed by default with proto3
+                    return Proto.Options == null || !Proto.Options.HasPacked || Proto.Options.Packed;
                }
            }
        }