diff options
author | Antoni Buszta <antoni@buszta.info> | 2014-10-08 11:21:04 +0200 |
---|---|---|
committer | Antoni Buszta <antoni@buszta.info> | 2014-10-08 11:27:18 +0200 |
commit | e83ba13a6fbb54f472ec16d486c6e3d4bbdf3adb (patch) | |
tree | 76e24e32e789ba6c7900ee30827f357dd52497c3 /src | |
parent | 0971bb0d57aa6f2db1abee4008b365d52b402891 (diff) | |
download | protobuf-e83ba13a6fbb54f472ec16d486c6e3d4bbdf3adb.tar.gz protobuf-e83ba13a6fbb54f472ec16d486c6e3d4bbdf3adb.tar.bz2 protobuf-e83ba13a6fbb54f472ec16d486c6e3d4bbdf3adb.zip |
InitializeDefaultRepeatedFields() allocates memory but does not release it.
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/extension_set.cc | 15 | ||||
-rw-r--r-- | src/google/protobuf/extension_set.h | 4 |
2 files changed, 19 insertions, 0 deletions
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 diff --git a/src/google/protobuf/extension_set.h b/src/google/protobuf/extension_set.h index 801eea68..d7ec5192 100644 --- a/src/google/protobuf/extension_set.h +++ b/src/google/protobuf/extension_set.h @@ -704,11 +704,13 @@ class RepeatedPrimitiveTypeTraits { // Declared here so that this can be friended below. void InitializeDefaultRepeatedFields(); +void DestroyDefaultRepeatedFields(); class LIBPROTOBUF_EXPORT RepeatedPrimitiveGenericTypeTraits { private: template<typename Type> friend class RepeatedPrimitiveTypeTraits; friend void InitializeDefaultRepeatedFields(); + friend void DestroyDefaultRepeatedFields(); static const RepeatedField<int32>* default_repeated_field_int32_; static const RepeatedField<int64>* default_repeated_field_int64_; static const RepeatedField<uint32>* default_repeated_field_uint32_; @@ -844,6 +846,7 @@ class LIBPROTOBUF_EXPORT RepeatedStringTypeTraits { private: friend void InitializeDefaultRepeatedFields(); + friend void DestroyDefaultRepeatedFields(); static const RepeatedFieldType *default_repeated_field_; }; @@ -1010,6 +1013,7 @@ class LIBPROTOBUF_EXPORT RepeatedMessageGenericTypeTraits { private: template<typename Type> friend class RepeatedMessageTypeTraits; friend void InitializeDefaultRepeatedFields(); + friend void DestroyDefaultRepeatedFields(); static const RepeatedFieldType* default_repeated_field_; }; |