diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc index b4f305d931..048397bd77 100644 --- a/src/google/protobuf/descriptor.cc +++ b/src/google/protobuf/descriptor.cc @@ -7200,6 +7200,7 @@ void DescriptorBuilder::ValidateFieldOptions( field->containing_type()->FindExtensionRangeContainingNumber( field->number()); + if (extension_range->options_ == nullptr) { return; }