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

Fixes NullReferenceException when accessing FieldDescriptor.IsPacked
protocolbuffers · Jan 31, 2022 · c756e61 · c756e61
2 parents 15add1a + 1694142
commit c756e61
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
@@ -247,7 +247,8 @@ public bool IsPacked
                 }
                 else
                 {
-                    return !Proto.Options.HasPacked || Proto.Options.Packed;
+                    // Packed by default with proto3
+                    return Proto.Options == null || !Proto.Options.HasPacked || Proto.Options.Packed;
                 }
             }
         }