From d5d6d4c89ef7f23b847d9e4fa459e57a4393b28d Mon Sep 17 00:00:00 2001 From: Karen Wu Date: Thu, 5 Feb 2026 14:19:20 -0800 Subject: [PATCH] Stripping empty options PiperOrigin-RevId: 866110173 --- src/google/protobuf/descriptor.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc index 821850ce3bed5..fbd967ab963d7 100644 --- a/src/google/protobuf/descriptor.cc +++ b/src/google/protobuf/descriptor.cc @@ -6687,7 +6687,8 @@ FileDescriptor* DescriptorBuilder::BuildFileImpl( GetFile(descriptor), {descriptor.proto_features_, &desc_proto, GetFullName(descriptor), proto.name()}); } - if (!IsDefaultInstance(*descriptor.options_)) { + if (!IsDefaultInstance(*descriptor.options_) && + descriptor.options_->ByteSizeLong() != 0) { deferred_validation_.ValidateFeatureLifetimes( GetFile(descriptor), {descriptor.options_, &desc_proto, GetFullName(descriptor), proto.name()});