From 06e6690bf2055b4361db2a6bdd21facf3f2d86d6 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Wed, 8 Oct 2014 17:28:03 -0700
Subject: Fix the memory leak of GetEmptyString().

---
 src/google/protobuf/generated_message_util.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/google/protobuf/generated_message_util.cc')

diff --git a/src/google/protobuf/generated_message_util.cc b/src/google/protobuf/generated_message_util.cc
index c30c07ca..0c20d81c 100644
--- 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);
 }
 
 
-- 
cgit v1.2.3