Improve failure message for unexpected descriptor.proto contents.

PiperOrigin-RevId: 650390094
5 months ago · e530d40bfc
parent c2299860fd
commit e530d40bfc
1 changed files with 5 additions and 2 deletions
--- 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<DynamicMessageFactory>();
  auto features =
      absl::WrapUnique(message_factory->GetPrototype(feature_set)->New());