Register a shutdown deleter for C++ feature defaults

Fixes #14794 PiperOrigin-RevId: 583510779
1 year ago · 6546eca70a
parent 8a1a6ef910
commit 6546eca70a
1 changed files with 10 additions and 8 deletions
--- a/src/google/protobuf/descriptor.cc
+++ b/src/google/protobuf/descriptor.cc
@ -1093,14 +1093,16 @@ bool AllowedExtendeeInProto3(const std::string& name) {
 }

 const FeatureSetDefaults& GetCppFeatureSetDefaults() {
-  static const FeatureSetDefaults* default_spec = [] {
+  static const FeatureSetDefaults* default_spec =
+      internal::OnShutdownDelete([] {
        auto* defaults = new FeatureSetDefaults();
        internal::ParseNoReflection(
-        absl::string_view{PROTOBUF_INTERNAL_CPP_EDITION_DEFAULTS,
+            absl::string_view{
+                PROTOBUF_INTERNAL_CPP_EDITION_DEFAULTS,
                sizeof(PROTOBUF_INTERNAL_CPP_EDITION_DEFAULTS) - 1},
            *defaults);
        return defaults;
-  }();
+      }());
  return *default_spec;
 }