From e83ba13a6fbb54f472ec16d486c6e3d4bbdf3adb Mon Sep 17 00:00:00 2001
From: Antoni Buszta <antoni@buszta.info>
Date: Wed, 8 Oct 2014 11:21:04 +0200
Subject: InitializeDefaultRepeatedFields() allocates memory but does not
 release it.

---
 src/google/protobuf/extension_set.cc | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/google/protobuf/extension_set.cc')

diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc
index 1b9ec36c..f4786392 100644
--- a/src/google/protobuf/extension_set.cc
+++ b/src/google/protobuf/extension_set.cc
@@ -1622,6 +1622,9 @@ struct StaticDefaultRepeatedFieldsInitializer {
   StaticDefaultRepeatedFieldsInitializer() {
     InitializeDefaultRepeatedFields();
   }
+  ~StaticDefaultRepeatedFieldsInitializer() {
+    DestroyDefaultRepeatedFields();
+  }
 } static_repeated_fields_initializer;
 
 void InitializeDefaultRepeatedFields() {
@@ -1645,6 +1648,18 @@ void InitializeDefaultRepeatedFields() {
       new RepeatedField<bool>;
 }
 
+void DestroyDefaultRepeatedFields() {
+  delete RepeatedStringTypeTraits::default_repeated_field_;
+  delete RepeatedMessageGenericTypeTraits::default_repeated_field_;
+  delete RepeatedPrimitiveGenericTypeTraits::default_repeated_field_int32_;
+  delete RepeatedPrimitiveGenericTypeTraits::default_repeated_field_int64_;
+  delete RepeatedPrimitiveGenericTypeTraits::default_repeated_field_uint32_;
+  delete RepeatedPrimitiveGenericTypeTraits::default_repeated_field_uint64_;
+  delete RepeatedPrimitiveGenericTypeTraits::default_repeated_field_double_;
+  delete RepeatedPrimitiveGenericTypeTraits::default_repeated_field_float_;
+  delete RepeatedPrimitiveGenericTypeTraits::default_repeated_field_bool_;
+}
+
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
-- 
cgit v1.2.3