diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2018-05-24 13:23:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-24 13:23:59 -0700 |
| commit | 449e532b087e43a45ca6d8eae640a6019e547aca (patch) | |
| tree | acd09cb7aebcef5d2c3ab3be4c51e07f83a4ce87 | |
| parent | 15cde292ce085bec0d089db2e1e2d3403e765d21 (diff) | |
| parent | daf039b8cd2f29cbc129273e11e269afd667ee06 (diff) | |
| download | protobuf-449e532b087e43a45ca6d8eae640a6019e547aca.tar.gz protobuf-449e532b087e43a45ca6d8eae640a6019e547aca.tar.bz2 protobuf-449e532b087e43a45ca6d8eae640a6019e547aca.zip | |
Merge pull request #4673 from acozzette/memory-leak-fixv3.6.0rc1
Make sure to delete temporary maps used by FileDescriptorTables
| -rw-r--r-- | src/google/protobuf/descriptor.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc index d466dd8b..83eae519 100644 --- a/src/google/protobuf/descriptor.cc +++ b/src/google/protobuf/descriptor.cc @@ -775,10 +775,10 @@ class FileDescriptorTables { SymbolsByParentMap symbols_by_parent_; mutable FieldsByNameMap fields_by_lowercase_name_; - mutable FieldsByNameMap* fields_by_lowercase_name_tmp_; + std::unique_ptr<FieldsByNameMap> fields_by_lowercase_name_tmp_; mutable GoogleOnceDynamic fields_by_lowercase_name_once_; mutable FieldsByNameMap fields_by_camelcase_name_; - mutable FieldsByNameMap* fields_by_camelcase_name_tmp_; + std::unique_ptr<FieldsByNameMap> fields_by_camelcase_name_tmp_; mutable GoogleOnceDynamic fields_by_camelcase_name_once_; FieldsByNumberMap fields_by_number_; // Not including extensions. EnumValuesByNumberMap enum_values_by_number_; @@ -1146,10 +1146,8 @@ bool DescriptorPool::Tables::AddFile(const FileDescriptor* file) { void FileDescriptorTables::FinalizeTables() { // Clean up the temporary maps used by AddFieldByStylizedNames(). - delete fields_by_lowercase_name_tmp_; - fields_by_lowercase_name_tmp_ = NULL; - delete fields_by_camelcase_name_tmp_; - fields_by_camelcase_name_tmp_ = NULL; + fields_by_lowercase_name_tmp_ = nullptr; + fields_by_camelcase_name_tmp_ = nullptr; } void FileDescriptorTables::AddFieldByStylizedNames( @@ -1164,7 +1162,7 @@ void FileDescriptorTables::AddFieldByStylizedNames( // entries from fields_by_number_. PointerStringPair lowercase_key(parent, field->lowercase_name().c_str()); - if (!InsertIfNotPresent(fields_by_lowercase_name_tmp_, lowercase_key, + if (!InsertIfNotPresent(fields_by_lowercase_name_tmp_.get(), lowercase_key, field)) { InsertIfNotPresent( &fields_by_lowercase_name_, lowercase_key, @@ -1172,7 +1170,7 @@ void FileDescriptorTables::AddFieldByStylizedNames( } PointerStringPair camelcase_key(parent, field->camelcase_name().c_str()); - if (!InsertIfNotPresent(fields_by_camelcase_name_tmp_, camelcase_key, + if (!InsertIfNotPresent(fields_by_camelcase_name_tmp_.get(), camelcase_key, field)) { InsertIfNotPresent( &fields_by_camelcase_name_, camelcase_key, |