Fix memory leak in InlinedStringField

4 years ago · 0a4fcd5d97
parent e4fb604bc1
commit 0a4fcd5d97
1 changed files with 6 additions and 1 deletions
--- a/src/google/protobuf/inlined_string_field.h
+++ b/src/google/protobuf/inlined_string_field.h
@ -297,7 +297,12 @@ inline InlinedStringField::InlinedStringField(
  new (get_mutable()) std::string(default_value);
 }

-inline InlinedStringField::InlinedStringField(Arena* /*arena*/) { Init(); }
+inline InlinedStringField::InlinedStringField(Arena* arena) {
+  Init();
+  if (arena != nullptr) {
+    arena->OwnDestructor(get_mutable());
+  }
+}

 inline const std::string& InlinedStringField::GetNoArena() const {
  return *get_const();