Fix the memory leak of GetEmptyString().

06e6690b · Feng Xiao · 0971bb0d · 06e6690b
Commit 06e6690b authored Oct 09, 2014 by Feng Xiao
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

generated_message_util.cc src/google/protobuf/generated_message_util.cc +5 -1

No files found.
--- a/src/google/protobuf/generated_message_util.cc
+++ b/src/google/protobuf/generated_message_util.cc
@@ -36,7 +36,6 @@

 #include <limits>

-
 namespace google {
 namespace protobuf {
 namespace internal {
@@ -51,8 +50,13 @@ double NaN() {
 const ::std::string* empty_string_;
 GOOGLE_PROTOBUF_DECLARE_ONCE(empty_string_once_init_);

+void DeleteEmptyString() {
+  delete empty_string_;
+}
+
 void InitEmptyString() {
  empty_string_ = new string;
+  OnShutdown(&DeleteEmptyString);
 }