From e530d40bfcb9f8ee1d2df1ce53d7173ddd93fb8d Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Mon, 8 Jul 2024 15:17:09 -0700 Subject: [PATCH] Improve failure message for unexpected descriptor.proto contents. PiperOrigin-RevId: 650390094 --- src/google/protobuf/compiler/python/generator.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/google/protobuf/compiler/python/generator.cc b/src/google/protobuf/compiler/python/generator.cc index 807a195931..dc4ac837c8 100644 --- a/src/google/protobuf/compiler/python/generator.cc +++ b/src/google/protobuf/compiler/python/generator.cc @@ -466,8 +466,11 @@ std::string Generator::GetResolvedFeatures( } // Load the resolved features from our pool. - const Descriptor* feature_set = file_->pool()->FindMessageTypeByName( - FeatureSet::GetDescriptor()->full_name()); + const Descriptor* feature_set = + file_->FindMessageTypeByName(FeatureSet::GetDescriptor()->name()); + ABSL_CHECK(feature_set != nullptr) + << "Malformed descriptor.proto doesn't contain " + << FeatureSet::GetDescriptor()->full_name(); auto message_factory = absl::make_unique(); auto features = absl::WrapUnique(message_factory->GetPrototype(feature_set)->New());