Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4673 from acozzette/memory-leak-fix

Browse Source 
Make sure to delete temporary maps used by FileDescriptorTables
pull/4684/head v3.6.0rc1
Adam Cozzette 7 years ago committed by GitHub
parent 15cde292ce daf039b8cd
commit 449e532b08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/google/protobuf/descriptor.cc

14
src/google/protobuf/descriptor.cc
Unescape View File

@ -775,10 +775,10 @@ class FileDescriptorTables {
SymbolsByParentMap symbols_by_parent_; SymbolsByParentMap symbols_by_parent_;
mutable FieldsByNameMap fields_by_lowercase_name_; 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 GoogleOnceDynamic fields_by_lowercase_name_once_;
mutable FieldsByNameMap fields_by_camelcase_name_; 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_; mutable GoogleOnceDynamic fields_by_camelcase_name_once_;
FieldsByNumberMap fields_by_number_; // Not including extensions. FieldsByNumberMap fields_by_number_; // Not including extensions.
EnumValuesByNumberMap enum_values_by_number_; EnumValuesByNumberMap enum_values_by_number_;
@ -1146,10 +1146,8 @@ bool DescriptorPool::Tables::AddFile(const FileDescriptor* file) {
void FileDescriptorTables::FinalizeTables() { void FileDescriptorTables::FinalizeTables() {
// Clean up the temporary maps used by AddFieldByStylizedNames(). // Clean up the temporary maps used by AddFieldByStylizedNames().
delete fields_by_lowercase_name_tmp_; fields_by_lowercase_name_tmp_ = nullptr;
fields_by_lowercase_name_tmp_ = NULL; fields_by_camelcase_name_tmp_ = nullptr;
delete fields_by_camelcase_name_tmp_;
fields_by_camelcase_name_tmp_ = NULL;
} }
void FileDescriptorTables::AddFieldByStylizedNames( void FileDescriptorTables::AddFieldByStylizedNames(
@ -1164,7 +1162,7 @@ void FileDescriptorTables::AddFieldByStylizedNames(
// entries from fields_by_number_. // entries from fields_by_number_.
PointerStringPair lowercase_key(parent, field->lowercase_name().c_str()); 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)) { field)) {
InsertIfNotPresent( InsertIfNotPresent(
&fields_by_lowercase_name_, lowercase_key, &fields_by_lowercase_name_, lowercase_key,
@ -1172,7 +1170,7 @@ void FileDescriptorTables::AddFieldByStylizedNames(
} }
PointerStringPair camelcase_key(parent, field->camelcase_name().c_str()); 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)) { field)) {
InsertIfNotPresent( InsertIfNotPresent(
&fields_by_camelcase_name_, camelcase_key, &fields_by_camelcase_name_, camelcase_key,

Write Preview
Loading…
Cancel
Save